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