diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-15 17:49:17 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-15 13:49:23 -0400 |
| commit | dfdea7d9e3900dfc778b4c5243c0aa13379cb56d (patch) | |
| tree | 07b21f770c0b56d8d7db73db37ee21edae4e529f | |
| parent | 06c6d01869c71bfb0bdf18161a6650295910dfd8 (diff) | |
| parent | 7662344faa00c6817072ef1ea53a8132bac20313 (diff) | |
| download | cmake-dfdea7d9e3900dfc778b4c5243c0aa13379cb56d.tar.gz | |
Merge topic 'ci-vs-16.8-in-16.9' into release-3.20
7662344faa gitlab-ci: Fix using VS 16.8 toolset under VS 16.9
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5910
| -rwxr-xr-x | .gitlab/ci/cmake.ps1 | 4 | ||||
| -rw-r--r-- | .gitlab/os-windows.yml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab/ci/cmake.ps1 b/.gitlab/ci/cmake.ps1 index c5bf9589dd..3d6fb81ed5 100755 --- a/.gitlab/ci/cmake.ps1 +++ b/.gitlab/ci/cmake.ps1 @@ -1,7 +1,7 @@ $erroractionpreference = "stop" -$version = "3.19.3" -$sha256sum = "3838E11A0DB08F97D687F061882A1E52807010A313F3AC716015B3587CA3F20E" +$version = "3.19.7" +$sha256sum = "E6788D6E23B3026C37FCFA7658075D6B5F9113F26FAE17FE372AD4A7EE62D5FD" $filename = "cmake-$version-win64-x64" $tarball = "$filename.zip" diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 3e9634d085..0b0a9481e6 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" + VCVARSVERSION: "14.28.29333" ### 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" + CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29333" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" ## Tags |