Skip to content

Commit

Permalink
🔨 [CI] Fix: on non-Windows, don't set vcpkg toolchain path
Browse files Browse the repository at this point in the history
  • Loading branch information
JulesFouchy committed Feb 5, 2025
1 parent 545f56d commit c961134
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/build_and_run_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
with:
cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
cmakeListsTxtPath: ${{github.workspace}}/${{env.cmakelists_folder}}/CMakeLists.txt
cmakeAppendedArgs: ${{env.cmake_configure_args}} -D CMAKE_BUILD_TYPE=${{matrix.build_type}} ${{matrix.config.cmake_configure_args}} -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache -D CMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake
cmakeAppendedArgs: ${{env.cmake_configure_args}} -D CMAKE_BUILD_TYPE=${{matrix.build_type}} ${{matrix.config.cmake_configure_args}} -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache ${{runner.os == 'Windows' && '-D CMAKE_TOOLCHAIN_FILE=${{ runner.temp }}/vcpkg/scripts/buildsystems/vcpkg.cmake' || ''}}
buildWithCMakeArgs: --config ${{matrix.build_type}} --target ${{env.cmake_target}}
cmakeBuildType: ${{matrix.build_type}}
buildDirectory: ${{github.workspace}}/build
Expand Down

0 comments on commit c961134

Please sign in to comment.