diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 4fcec09..5aa0c62 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -70,17 +70,10 @@ jobs: restore-keys: | ${{ runner.os }}-conan- - - name: Install Conan Dependencies (Linux) - if: runner.os == 'Linux' + - name: Install Conan Dependencies run: | conan install . --build=missing -s build_type=${{ matrix.build_type }} - - name: Install Conan Dependencies (Windows) - if: runner.os == 'Windows' - shell: pwsh - run: | - 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 - - name: Set Build Directory id: strings shell: bash @@ -100,16 +93,14 @@ jobs: run: | if [ "${{ runner.os }}" == "Windows" ]; then build_dir="${{ github.workspace }}\\build\\${{ matrix.build_type }}" - toolchain_path="${{ github.workspace }}\\build\\${{ matrix.build_type }}\\generators\\conan_toolchain.cmake" else build_dir="${{ github.workspace }}/build/${{ matrix.build_type }}" - toolchain_path="${{ github.workspace }}/build/${{ matrix.build_type }}/generators/conan_toolchain.cmake" fi - cmake -S . \ + cmake --preset ${{ steps.strings.outputs.preset }} \ + -S . \ -B "$build_dir" \ -G Ninja \ - -DCMAKE_TOOLCHAIN_FILE="$toolchain_path" \ -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - name: Build