catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Fix Windows ClangCL build-system CI: select compatible Conan runner, expose MSBuild, and use ClangCL in Premake and Xmake
- Commit
cbb65f9db0cead23ea03897eb5a13cf159a054d5- Author
- Leitwolf11 ·
- Parents
fa9c41a6c634
Changes
.github/workflows/alternative-build-systems.yml | 7 ++++++- .github/workflows/package-manager-builds.yaml | 3 ++- premake5.lua | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/alternative-build-systems.yml b/.github/workflows/alternative-build-systems.yml index 7f2cf531..114d512e 100644 --- a/.github/workflows/alternative-build-systems.yml +++ b/.github/workflows/alternative-build-systems.yml @@ -19,7 +19,7 @@ jobs: xmake-version: '3.1.1' - name: Configure Clang build - run: xmake f --toolchain=clang -m debug -y + run: xmake f --toolchain=${{ runner.os == 'Windows' && 'clang-cl' || 'clang' }} -m debug -y - name: Build run: xmake -j 4 @@ -42,6 +42,11 @@ jobs: with: version: '5.0.0-beta7' + - uses: microsoft/setup-msbuild@v3 + if: runner.os == 'Windows' + with: + msbuild-architecture: x64 + - name: Generate and build Visual Studio projects if: runner.os == 'Windows' shell: pwsh diff --git a/.github/workflows/package-manager-builds.yaml b/.github/workflows/package-manager-builds.yaml index cfd7cd67..d98a5b63 100644 --- a/.github/workflows/package-manager-builds.yaml +++ b/.github/workflows/package-manager-builds.yaml @@ -8,7 +8,8 @@ jobs: runs-on: ${{matrix.os}} strategy: matrix: - os: [macos-15, windows-2025] + # Conan's detected MSVC runtime targets the VS 2022 (v143) toolset. + os: [macos-15, windows-2022] conan_version: - '2.31.1' diff --git a/premake5.lua b/premake5.lua index 9c2115d2..7a7d5e2a 100644 --- a/premake5.lua +++ b/premake5.lua @@ -13,6 +13,7 @@ workspace "Catch3" filter "system:windows" architecture "x86_64" + toolset "clang" filter {} filter "system:macosx"