@@ -76,11 +76,15 @@ jobs:
7676 printf '%s\n%s\n' "$base" "$chain" | sed 's/^ *//' > "$T/x64-windows-chain.cmake"
7777 printf '%s\n%s\nset(VCPKG_LOAD_VCVARS_ENV ON)\n' "$base" "$chain" | sed 's/^ *//' > "$T/x64-windows-chainvc.cmake"
7878 cat > "$T/chain.cmake" <<'EOF'
79- set(CMAKE_C_COMPILER "$ENV{MEASURE_CL}")
80- set(CMAKE_CXX_COMPILER "$ENV{MEASURE_CL}")
81- set(CMAKE_RC_COMPILER "$ENV{MEASURE_RC}")
82- set(CMAKE_MT "$ENV{MEASURE_MT}")
83- include("$ENV{MEASURE_VCPKG_ROOT}/scripts/toolchains/windows.cmake")
79+ file(TO_CMAKE_PATH "$ENV{MEASURE_CL}" _cl)
80+ file(TO_CMAKE_PATH "$ENV{MEASURE_RC}" _rc)
81+ file(TO_CMAKE_PATH "$ENV{MEASURE_MT}" _mt)
82+ file(TO_CMAKE_PATH "$ENV{MEASURE_VCPKG_ROOT}" _vr)
83+ set(CMAKE_C_COMPILER "${_cl}")
84+ set(CMAKE_CXX_COMPILER "${_cl}")
85+ set(CMAKE_RC_COMPILER "${_rc}")
86+ set(CMAKE_MT "${_mt}")
87+ include("${_vr}/scripts/toolchains/windows.cmake")
8488 EOF
8589 sed -i 's/^ *//' "$T/chain.cmake"
8690 cat "$T"/*.cmake
@@ -135,7 +139,6 @@ jobs:
135139
136140 vcpkg-managed :
137141 name : M3 P3 (Visual Studio masked, managed msvc)
138- if : " !contains(github.event.head_commit.message, '[vs-only]')"
139142 runs-on : windows-2025
140143 timeout-minutes : 150
141144 defaults : { run: { shell: bash } }
@@ -192,9 +195,11 @@ jobs:
192195 'set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/chain.cmake")' \
193196 'set(VCPKG_ENV_PASSTHROUGH_UNTRACKED INCLUDE LIB LIBPATH MEASURE_CL MEASURE_RC MEASURE_MT MEASURE_VCPKG_ROOT)' \
194197 > "$T/x64-windows-chain.cmake"
195- printf '%s\n' 'set(CMAKE_C_COMPILER "$ENV{MEASURE_CL}")' 'set(CMAKE_CXX_COMPILER "$ENV{MEASURE_CL}")' \
196- 'set(CMAKE_RC_COMPILER "$ENV{MEASURE_RC}")' 'set(CMAKE_MT "$ENV{MEASURE_MT}")' \
197- 'include("$ENV{MEASURE_VCPKG_ROOT}/scripts/toolchains/windows.cmake")' > "$T/chain.cmake"
198+ printf '%s\n' 'file(TO_CMAKE_PATH "$ENV{MEASURE_CL}" _cl)' 'file(TO_CMAKE_PATH "$ENV{MEASURE_RC}" _rc)' \
199+ 'file(TO_CMAKE_PATH "$ENV{MEASURE_MT}" _mt)' 'file(TO_CMAKE_PATH "$ENV{MEASURE_VCPKG_ROOT}" _vr)' \
200+ 'set(CMAKE_C_COMPILER "${_cl}")' 'set(CMAKE_CXX_COMPILER "${_cl}")' \
201+ 'set(CMAKE_RC_COMPILER "${_rc}")' 'set(CMAKE_MT "${_mt}")' \
202+ 'include("${_vr}/scripts/toolchains/windows.cmake")' > "$T/chain.cmake"
198203 setenv() { # $1 = the toolset directory
199204 w() { cygpath -w "$1"; }
200205 export MEASURE_CL="$(w "$1/bin/Hostx64/x64/cl.exe")"
@@ -226,7 +231,7 @@ jobs:
226231
227232 mcpp-legs :
228233 name : E2b E4 (mcpp 2026.9.28.2)
229- if : " !contains(github.event.head_commit.message, '[vs -only]')"
234+ if : " !contains(github.event.head_commit.message, '[vcpkg -only]')"
230235 runs-on : windows-2025
231236 timeout-minutes : 120
232237 defaults : { run: { shell: bash } }
0 commit comments