Skip to content

Commit 639d483

Browse files
committed
Changing MSVC to clang-cl on win (XI)
1 parent 426876a commit 639d483

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ jobs:
5050
id: build_windows
5151
run: pip install -e .[test]
5252
env:
53-
CMAKE_ARGS: "-G Ninja -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl"
54-
SKBUILD_CMAKE_ARGS: "-G Ninja -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl"
53+
CMAKE_GENERATOR: Ninja
54+
CMAKE_C_COMPILER: clang-cl
55+
CMAKE_CXX_COMPILER: clang-cl
5556
CC: clang-cl
5657
CXX: clang-cl
5758
continue-on-error: true

.github/workflows/cibuildwheels.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ env:
1717
# Skip PyPy wheels for now (numexpr needs some adjustments first)
1818
# musllinux takes too long to build, and it's not worth it for now
1919
CIBW_SKIP: "pp* *musllinux* *-win32"
20-
# Use CMAKE_ARGS/SKBUILD_CMAKE_ARGS so scikit-build-core forwards generator/compiler reliably on Windows.
21-
CIBW_ENVIRONMENT_WINDOWS: "PATH=C:\\Program Files\\LLVM\\bin;%PATH% CC=clang-cl CXX=clang-cl CMAKE_ARGS=\"-G Ninja -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl\" SKBUILD_CMAKE_ARGS=\"-G Ninja -DCMAKE_C_COMPILER=clang-cl -DCMAKE_CXX_COMPILER=clang-cl\""
20+
# Use explicit generator/compiler env vars; CMAKE_ARGS with spaces is not split on Windows.
21+
CIBW_ENVIRONMENT_WINDOWS: "PATH=C:\\Program Files\\LLVM\\bin;%PATH% CC=clang-cl CXX=clang-cl CMAKE_GENERATOR=Ninja CMAKE_C_COMPILER=clang-cl CMAKE_CXX_COMPILER=clang-cl"
2222

2323
jobs:
2424

0 commit comments

Comments
 (0)