Merge topic 'ci-msvc-19.32'

cc93d2af08 gitlab-ci: Update Windows builds to MSVC 19.32 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7259
This commit is contained in:
Brad King
2022-05-13 12:40:34 +00:00
committed by Kitware Robot
+4 -4
View File
@@ -35,7 +35,7 @@
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.31.31103"
VCVARSVERSION: "14.32.31326"
.windows_vs2022_x64_ninja:
extends:
@@ -54,7 +54,7 @@
CMAKE_CONFIGURATION: windows_vs2022_x64
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.31.31103"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.32.31326"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2019_x64:
@@ -173,7 +173,7 @@
- windows
- shell
- vs2022
- msvc-19.31
- msvc-19.32
- nonconcurrent
.windows_tags_concurrent_vs2022:
@@ -182,7 +182,7 @@
- windows
- shell
- vs2022
- msvc-19.31
- msvc-19.32
- concurrent
.windows_tags_concurrent_vs2019: