Skip to content

Commit 46d3b47

Browse files
committed
GitHub CI: Pass toolset version as argument to cmake
It doesn't seem like the toolset field in CMakePresets.json can contain a macro argument like $penv{}.
1 parent 1e087a4 commit 46d3b47

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

.github/workflows/buildWindows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
$env:VCPKG_ROOT="$env:VCPKG_INSTALLATION_ROOT"
109109
$env:CESIUM_TOOLSET_VERSION="${{ inputs.cmake-toolchain }}"
110110
if ($env:CESIUM_TOOLSET_VERSION) {
111-
cmake -B build -S . -A "${{ inputs.cmake-platform }}" --preset Windows-CI-Versioned
111+
cmake -B build -S . -T "version=${{ inputs.cmake-toolchain}" -A "${{ inputs.cmake-platform }}" --preset Windows-CI-Versioned
112112
}
113113
else {
114114
cmake -B build -S . -A "${{ inputs.cmake-platform }}" -preset Windows-CI

extern/CMakePresets.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343
{
4444
"name": "Windows-CI-Versioned",
4545
"inherits": "Windows-CI",
46-
"toolset": {
47-
"value": "version=$penv{CESIUM_TOOLSET_VERSION}",
48-
"strategy": "set"
49-
},
5046
"environment": {
5147
"CESIUM_TOOLSET_VERSION": "$penv{CESIUM_TOOLSET_VERSION}"
5248
}

0 commit comments

Comments
 (0)