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

Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9

Browse Source
This commit is contained in:
Brad King
2021-03-24 10:20:35 -04:00
parent b7b0fb4303 3a042bef8e
commit 472a11c3d2
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
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.28.29333"
VCVARSVERSION: "14.28.29910"
### External testing
@@ -49,7 +49,7 @@
CMAKE_CONFIGURATION: windows_vs2019_x64
CMAKE_GENERATOR: "Visual Studio 16 2019"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29333"
CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29910"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
## Tags
@@ -60,7 +60,7 @@
- windows
- shell
- vs2019
- msvc-19.28
- msvc-19.28-16.9
- nonconcurrent
.windows_builder_ext_tags:
@@ -69,7 +69,7 @@
- windows
- shell
- vs2019
- msvc-19.28
- msvc-19.28-16.9
- concurrent
## Windows-specific scripts