.

Author: khmyznikov

.github/workflows/wheels.yml

@@ -37,18 +37,38 @@ jobs:
           CIBW_PLATFORM: 'auto'
           CIBW_BEFORE_BUILD_WINDOWS: |
             echo "Attempting to set up MSVC ARM64 environment..."
-            rem Assuming Visual Studio 2022 Enterprise edition. Adjust path if different (e.g., Community, BuildTools).
-            call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" arm64
-            echo "Setting CC, CXX, CL, and _CL_ environment variables for Meson"
-            set CC=cl
-            set CXX=cl
-            rem /Brepro helps with build reproducibility
-            set CL=/Brepro
-            set _CL_=/Brepro
-            echo "Environment setup complete. PATH is: %PATH%"
-            echo "CC is: %CC%, CXX is: %CXX%"
-            echo "Verifying cl.exe is in PATH:"
+            set VCVARS_PATH_ENTERPRISE="C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat"
+            set VCVARS_PATH_BUILDTOOLS="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvarsall.bat"
+            set CHOSEN_VCVARS_PATH=
+
+            if exist %VCVARS_PATH_ENTERPRISE% (
+              echo "Found VS Enterprise vcvarsall.bat: %VCVARS_PATH_ENTERPRISE%"
+              set CHOSEN_VCVARS_PATH=%VCVARS_PATH_ENTERPRISE%
+            ) else if exist %VCVARS_PATH_BUILDTOOLS% (
+              echo "Found VS Build Tools vcvarsall.bat: %VCVARS_PATH_BUILDTOOLS%"
+              set CHOSEN_VCVARS_PATH=%VCVARS_PATH_BUILDTOOLS%
+            ) else (
+              echo "ERROR: vcvarsall.bat not found at expected locations."
+              exit /b 1
+            )
+
+            echo "Calling %CHOSEN_VCVARS_PATH% arm64"
+            call %CHOSEN_VCVARS_PATH% arm64
+            if errorlevel 1 (
+              echo "ERROR: vcvarsall.bat execution failed."
+              exit /b 1
+            )
+            echo "MSVC environment setup complete."
+            echo "Verifying cl.exe:"
             where cl
+            if errorlevel 1 (
+              echo "ERROR: cl.exe not found in PATH after vcvarsall.bat."
+              exit /b 1
+            )
+            echo "PATH is: %PATH%"
+            echo "INCLUDE is: %INCLUDE%"
+            echo "LIB is: %LIB%"
+          CIBW_ENVIRONMENT_WINDOWS: 'CC=cl CXX=cl CL=/Brepro _CL_=/Brepro'
 
       - name: Set up Python for validation
         uses: mamba-org/setup-micromamba@v2