diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-24 10:22:29 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-24 10:22:29 -0400 |
| commit | 0913499f69463c94cc16ed437721e88148e131a8 (patch) | |
| tree | bc78eb9730c5992373a06ac251ec89501788731d | |
| parent | 1e79c230fa1ed0d6f0e91e890415e8fa9cd9b6bd (diff) | |
| parent | 3a042bef8e5a1d5c03f9cad01c603b536b46ba6f (diff) | |
| download | cmake-0913499f69463c94cc16ed437721e88148e131a8.tar.gz | |
Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into release-3.19
Merge-request: !5935
| -rw-r--r-- | .gitlab/os-windows.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 14ec309610..e63953e6e1 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -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" ## Tags @@ -59,7 +59,7 @@ - windows - shell - vs2019 - - msvc-19.28 + - msvc-19.28-16.9 - nonconcurrent .windows_builder_ext_tags: @@ -68,7 +68,7 @@ - windows - shell - vs2019 - - msvc-19.28 + - msvc-19.28-16.9 - concurrent ## Windows-specific scripts |