File tree 1 file changed +12
-3
lines changed
1 file changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -70,10 +70,17 @@ jobs:
70
70
restore-keys : |
71
71
${{ runner.os }}-conan-
72
72
73
- - name : Install Conan Dependencies
73
+ - name : Install Conan Dependencies (Linux)
74
+ if : runner.os == 'Linux'
74
75
run : |
75
76
conan install . --build=missing -s build_type=${{ matrix.build_type }}
76
77
78
+ - name : Install Conan Dependencies (Windows)
79
+ if : runner.os == 'Windows'
80
+ shell : pwsh
81
+ run : |
82
+ conan install . --build=missing -s build_type=${{ matrix.build_type }} -c tools.cmake.cmake_layout:build_folder_vars=['generators'] -c tools.cmake.cmaketoolchain:generator=Ninja
83
+
77
84
- name : Set Build Directory
78
85
id : strings
79
86
shell : bash
@@ -93,14 +100,16 @@ jobs:
93
100
run : |
94
101
if [ "${{ runner.os }}" == "Windows" ]; then
95
102
build_dir="${{ github.workspace }}\\build\\${{ matrix.build_type }}"
103
+ toolchain_path="${{ github.workspace }}\\build\\${{ matrix.build_type }}\\generators\\conan_toolchain.cmake"
96
104
else
97
105
build_dir="${{ github.workspace }}/build/${{ matrix.build_type }}"
106
+ toolchain_path="${{ github.workspace }}/build/${{ matrix.build_type }}/generators/conan_toolchain.cmake"
98
107
fi
99
108
100
- cmake --preset ${{ steps.strings.outputs.preset }} \
101
- -S . \
109
+ cmake -S . \
102
110
-B "$build_dir" \
103
111
-G Ninja \
112
+ -DCMAKE_TOOLCHAIN_FILE="$toolchain_path" \
104
113
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
105
114
106
115
- name : Build
You can’t perform that action at this time.
0 commit comments