diff options
| author | coco875 <59367621+coco875@users.noreply.github.com> | 2025-08-06 14:13:52 +0200 |
|---|---|---|
| committer | Lywx <kiritodev01@gmail.com> | 2025-08-06 09:16:54 -0600 |
| commit | 7e6fc658cbd028559be275e9a075c22cc86c0eb5 (patch) | |
| tree | 477ee7d61dedce46a4e027a31b6af4ac17af0480 | |
| parent | fd8fa0d44b42be716287a4d708152e3f3fef62de (diff) | |
try add clang cl
| -rw-r--r-- | .github/workflows/windows_build.yml | 8 | ||||
| -rw-r--r-- | cmake/toolchain/windows-clang-cl.cmake | 1 | ||||
| -rw-r--r-- | cmake/toolchain/windows-msvc.cmake (renamed from cmake/toolchain/windows-msvc) | 0 |
3 files changed, 5 insertions, 4 deletions
diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml index 0d2e0f3..fe45beb 100644 --- a/.github/workflows/windows_build.yml +++ b/.github/workflows/windows_build.yml @@ -12,19 +12,19 @@ jobs: strategy: matrix: config: [Release, Debug] - toolchain: [cmake/toolchain/windows-msvc, clangcl] + toolchain: [cmake/toolchain/windows-msvc.cmake, cmake/toolchain/windows-clang-cl.cmake] standalone: [OFF, ON] generate: [Visual Studio 17 2022, Ninja] arch: [x64, Win32] exclude: - - toolchain: clangcl + - toolchain: cmake/toolchain/windows-clang-cl arch: Win32 steps: - uses: actions/checkout@v4 - name: Build Visual Studio if: ${{ matrix.generate == 'Visual Studio 17 2022' }} run: | - cmake -S . -B "build/${{ matrix.arch }}" -G "${{ matrix.generate }}" -DCMAKE_TOOLCHAIN_FILE=${{ matrix.toolchain }} -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} + cmake -S . -B "build/${{ matrix.arch }}" -G "${{ matrix.generate }}" -DCMAKE_TOOLCHAIN_FILE="${{ matrix.toolchain }}" -DCMAKE_GENERATOR_PLATFORM=${{ matrix.arch }} -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} cmake --build ./build/${{ matrix.arch }} - name: Setup Ninja if: ${{ matrix.generate == 'Ninja' }} @@ -38,7 +38,7 @@ jobs: cmake -S . -B "build/${{ matrix.arch }}" -G "${{ matrix.generate }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} -DUSE_STANDALONE=${{ matrix.standalone }} cmake --build ./build/${{ matrix.arch }} --config ${{ matrix.config }} --parallel 10 - name: Build Ninja clang-cl - if: ${{ matrix.generate == 'Ninja' && matrix.toolchain == 'clangcl' }} + if: ${{ matrix.generate == 'Ninja' && matrix.toolchain == 'cmake/toolchain/windows-clang-cl.cmake' }} run: | cmake -S . -B "build/${{ matrix.arch }}" -G "${{ matrix.generate }}" -DCMAKE_BUILD_TYPE:STRING=${{ matrix.config }} -DCMAKE_CXX_COMPILER=clang-cl.exe -DCMAKE_C_COMPILER=clang-cl.exe -DCMAKE_LINKER=lld-link.exe -DUSE_STANDALONE=${{ matrix.standalone }} cmake --build ./build/${{ matrix.arch }} --config ${{ matrix.config }} --parallel 10 diff --git a/cmake/toolchain/windows-clang-cl.cmake b/cmake/toolchain/windows-clang-cl.cmake new file mode 100644 index 0000000..373ac31 --- /dev/null +++ b/cmake/toolchain/windows-clang-cl.cmake @@ -0,0 +1 @@ +set(CMAKE_GENERATOR_TOOLSET "clangcl")
\ No newline at end of file diff --git a/cmake/toolchain/windows-msvc b/cmake/toolchain/windows-msvc.cmake index d5fe2cb..d5fe2cb 100644 --- a/cmake/toolchain/windows-msvc +++ b/cmake/toolchain/windows-msvc.cmake |