diff options
| author | Brad King <brad.king@kitware.com> | 2020-06-03 18:10:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-06-03 18:10:50 (GMT) |
| commit | 005269a03f43f1c00c3fb046a1ecb0378c34b0b9 (patch) | |
| tree | 783b2f12786d4bd845328b08faee8c016a253935 | |
| parent | 420a75fc3f612bbc938db9e16f8eb22b0118301c (diff) | |
| parent | f65ba96043fa7df44b0c4eebba6e2595de678e25 (diff) | |
| download | CMake-005269a03f43f1c00c3fb046a1ecb0378c34b0b9.zip CMake-005269a03f43f1c00c3fb046a1ecb0378c34b0b9.tar.gz CMake-005269a03f43f1c00c3fb046a1ecb0378c34b0b9.tar.bz2 | |
Merge topic 'gitlab-ci-msvc-14.26'
f65ba96043 gitlab-ci: Update Windows builds to MSVC 19.26
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4851
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d9456b..8a9246f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -138,7 +138,7 @@ CMAKE_CONFIGURATION: windows_vs2019_x64_ninja VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" - VCVARSVERSION: "14.25" + VCVARSVERSION: "14.26" .windows_vs2019_x64: &windows_vs2019_x64 extends: .windows @@ -147,7 +147,7 @@ CMAKE_CONFIGURATION: windows_vs2019_x64 CMAKE_GENERATOR: "Visual Studio 16 2019" CMAKE_GENERATOR_PLATFORM: "x64" - CMAKE_GENERATOR_TOOLSET: "v142,version=14.25" + CMAKE_GENERATOR_TOOLSET: "v142,version=14.26" .linux_builder_tags: &linux_builder_tags tags: |