mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-29 02:19:18 -05:00
Merge topic 'gitlab-ci-msvc-14.27' into release-3.18
983cb0c891 gitlab-ci: Update Windows builds to MSVC 19.27
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5144
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
CMAKE_CONFIGURATION: windows_vs2019_x64_ninja
|
||||
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
|
||||
VCVARSPLATFORM: "x64"
|
||||
VCVARSVERSION: "14.26"
|
||||
VCVARSVERSION: "14.27"
|
||||
|
||||
### External testing
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
CMAKE_CONFIGURATION: windows_vs2019_x64
|
||||
CMAKE_GENERATOR: "Visual Studio 16 2019"
|
||||
CMAKE_GENERATOR_PLATFORM: "x64"
|
||||
CMAKE_GENERATOR_TOOLSET: "v142,version=14.26"
|
||||
CMAKE_GENERATOR_TOOLSET: "v142,version=14.27"
|
||||
|
||||
## Tags
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
- windows
|
||||
- shell
|
||||
- vs2019
|
||||
- msvc-19.25
|
||||
- msvc-19.27
|
||||
- nonconcurrent
|
||||
|
||||
.windows_builder_ext_tags:
|
||||
@@ -66,7 +66,7 @@
|
||||
- windows
|
||||
- shell
|
||||
- vs2019
|
||||
- msvc-19.25
|
||||
- msvc-19.27
|
||||
- concurrent
|
||||
|
||||
## Windows-specific scripts
|
||||
|
||||
Reference in New Issue
Block a user