diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-17 13:40:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-17 13:40:14 (GMT) |
| commit | 1e79c230fa1ed0d6f0e91e890415e8fa9cd9b6bd (patch) | |
| tree | 662e986c1e82d6d533e1028ccbd5b75cfd38bf3a | |
| parent | 80255a5aa98ff8db6c64bb0a739054f695ac7da7 (diff) | |
| parent | 9f36461e12fb57ea4a886040005c7d8e525ac9ce (diff) | |
| download | CMake-1e79c230fa1ed0d6f0e91e890415e8fa9cd9b6bd.zip CMake-1e79c230fa1ed0d6f0e91e890415e8fa9cd9b6bd.tar.gz CMake-1e79c230fa1ed0d6f0e91e890415e8fa9cd9b6bd.tar.bz2 | |
Merge branch 'backport-3.19-ci-vs-16.8-in-16.9' into release-3.19
Merge-request: !5918
| -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 e7b4de7..3d6fb81 100755 --- a/.gitlab/ci/cmake.ps1 +++ b/.gitlab/ci/cmake.ps1 @@ -1,7 +1,7 @@ $erroractionpreference = "stop" -$version = "3.19.0" -$sha256sum = "67BBDA67C98C5F0789199FE1DB650F12274A6AD40FD8CAE88D208029AC618905" +$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 1fff2bb..14ec309 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" ## Tags |