diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-15 14:08:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-15 16:19:00 (GMT) |
| commit | 7662344faa00c6817072ef1ea53a8132bac20313 (patch) | |
| tree | 07b21f770c0b56d8d7db73db37ee21edae4e529f /.gitlab/os-windows.yml | |
| parent | 06c6d01869c71bfb0bdf18161a6650295910dfd8 (diff) | |
| download | CMake-7662344faa00c6817072ef1ea53a8132bac20313.zip CMake-7662344faa00c6817072ef1ea53a8132bac20313.tar.gz CMake-7662344faa00c6817072ef1ea53a8132bac20313.tar.bz2 | |
gitlab-ci: Fix using VS 16.8 toolset under VS 16.9
The 16.8 and 16.9 toolset numbers vary only in their third component.
Use CMake 3.19.7 for three-component toolset version specification
support.
Diffstat (limited to '.gitlab/os-windows.yml')
| -rw-r--r-- | .gitlab/os-windows.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index 3e9634d..0b0a948 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 |