Skip to content

Commit ee5f847

Browse files
committed
🔨 Another CMake github actions attempt
1 parent 09196af commit ee5f847

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

.github/workflows/cmake-multi-platform.yml

+3-12
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,10 @@ jobs:
7070
restore-keys: |
7171
${{ runner.os }}-conan-
7272
73-
- name: Install Conan Dependencies (Linux)
74-
if: runner.os == 'Linux'
73+
- name: Install Conan Dependencies
7574
run: |
7675
conan install . --build=missing -s build_type=${{ matrix.build_type }}
7776
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-
8477
- name: Set Build Directory
8578
id: strings
8679
shell: bash
@@ -100,16 +93,14 @@ jobs:
10093
run: |
10194
if [ "${{ runner.os }}" == "Windows" ]; then
10295
build_dir="${{ github.workspace }}\\build\\${{ matrix.build_type }}"
103-
toolchain_path="${{ github.workspace }}\\build\\${{ matrix.build_type }}\\generators\\conan_toolchain.cmake"
10496
else
10597
build_dir="${{ github.workspace }}/build/${{ matrix.build_type }}"
106-
toolchain_path="${{ github.workspace }}/build/${{ matrix.build_type }}/generators/conan_toolchain.cmake"
10798
fi
10899
109-
cmake -S . \
100+
cmake --preset ${{ steps.strings.outputs.preset }} \
101+
-S . \
110102
-B "$build_dir" \
111103
-G Ninja \
112-
-DCMAKE_TOOLCHAIN_FILE="$toolchain_path" \
113104
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
114105
115106
- name: Build

0 commit comments

Comments
 (0)