Another attempt to set MSVC compiler vars properly

zpostfacto · zpostfacto · commit abaf71e48f25 · 2026-04-10T21:52:10.000-07:00
diff --git a/.github/setup-msvc-env.bat b/.github/setup-msvc-env.bat
@@ -18,3 +18,7 @@ if "%VSINSTALLDIR%"=="" (
 )
 
 call "%VSINSTALLDIR%\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64
+
+rem Prevent inherited GCC/Clang hints from steering CMake to MinGW.
+set "CC="
+set "CXX="
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -74,7 +74,7 @@ jobs:
           call %GITHUB_WORKSPACE%\.github\setup-msvc-env.bat
           mkdir build
           cd build
-          cmake -S .. -G Ninja -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_TOOLS=ON -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DUSE_CRYPTO=${{matrix.crypto}}
+          cmake -S .. -G Ninja -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_TOOLS=ON -DCMAKE_TOOLCHAIN_FILE=${{env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake -DUSE_CRYPTO=${{matrix.crypto}}
         shell: cmd
 
       - name: Build projects

Original file line number	Diff line number	Diff line change
`@@ -18,3 +18,7 @@ if "%VSINSTALLDIR%"=="" (`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`call "%VSINSTALLDIR%\Common7\Tools\VsDevCmd.bat" -arch=amd64 -host_arch=amd64`
	`21`	`+`
	`22`	`+rem Prevent inherited GCC/Clang hints from steering CMake to MinGW.`
	`23`	`+set "CC="`
	`24`	`+set "CXX="`