Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

gitlab-ci: Fix using VS 16.8 toolset under VS 16.9

Browse Source 
The 16.8 and 16.9 toolset numbers vary only in their third component.
Use CMake 3.19.7 for three-component toolset version specification
support.
This commit is contained in:
Brad King
2021-03-15 10:08:19 -04:00
parent 06c6d01869
commit 7662344faa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/ci/cmake.ps1
View File

@@ -1,7 +1,7 @@
$erroractionpreference = "stop" $erroractionpreference = "stop"
$version = "3.19.3" $version = "3.19.7"
$sha256sum = "3838E11A0DB08F97D687F061882A1E52807010A313F3AC716015B3587CA3F20E" $sha256sum = "E6788D6E23B3026C37FCFA7658075D6B5F9113F26FAE17FE372AD4A7EE62D5FD"
$filename = "cmake-$version-win64-x64" $filename = "cmake-$version-win64-x64"
$tarball = "$filename.zip" $tarball = "$filename.zip"

4
.gitlab/os-windows.yml
View File

@@ -38,7 +38,7 @@
CMAKE_CONFIGURATION: windows_vs2019_x64_ninja CMAKE_CONFIGURATION: windows_vs2019_x64_ninja
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64" VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.28" VCVARSVERSION: "14.28.29333"
### External testing ### External testing
@@ -49,7 +49,7 @@
CMAKE_CONFIGURATION: windows_vs2019_x64 CMAKE_CONFIGURATION: windows_vs2019_x64
CMAKE_GENERATOR: "Visual Studio 16 2019" CMAKE_GENERATOR: "Visual Studio 16 2019"
CMAKE_GENERATOR_PLATFORM: "x64" CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v142,version=14.28" CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29333"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
## Tags ## Tags