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

gitlab-ci: Update Windows builds to MSVC 19.29-16.10 toolset

Browse Source
This commit is contained in:
Brad King
2021-05-28 10:57:17 -04:00
parent f4f80cfec6
commit 59d9fa7131
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.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.29910" VCVARSVERSION: "14.29.30037"
### 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.29910" CMAKE_GENERATOR_TOOLSET: "v142,version=14.29.30037"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
## Tags ## Tags
@@ -60,7 +60,7 @@
- windows - windows
- shell - shell
- vs2019 - vs2019
- msvc-19.28-16.9 - msvc-19.29-16.10
- nonconcurrent - nonconcurrent
.windows_builder_ext_tags: .windows_builder_ext_tags:
@@ -69,7 +69,7 @@
- windows - windows
- shell - shell
- vs2019 - vs2019
- msvc-19.28-16.9 - msvc-19.29-16.10
- concurrent - concurrent
## Windows-specific scripts ## Windows-specific scripts