diff options
| author | Brad King <brad.king@kitware.com> | 2020-08-20 11:53:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-08-20 11:53:12 (GMT) |
| commit | 590b8791a0bd26c72bc4a007e98a1d7eabe9dc07 (patch) | |
| tree | f06de4b74d8695e48591c248a93af6e4383d64c3 | |
| parent | eeaa8901478ea595654c2d7c967116e525448aab (diff) | |
| parent | 983cb0c89103311d8bf297392dfdbbcec7b3eb1a (diff) | |
| download | CMake-590b8791a0bd26c72bc4a007e98a1d7eabe9dc07.zip CMake-590b8791a0bd26c72bc4a007e98a1d7eabe9dc07.tar.gz CMake-590b8791a0bd26c72bc4a007e98a1d7eabe9dc07.tar.bz2 | |
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
| -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 910a232..63b8758 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -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 |