dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-08 08:40:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

gitlab-ci: Update Windows builds to MSVC 14.33 toolset

Browse Source
This commit is contained in:
Brad King
2022-08-15 14:43:31 -04:00
parent d83505b364
commit 6f17996edc
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab/os-windows.yml
View File

@@ -35,19 +35,19 @@
variables: variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64" VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.32.31326" VCVARSVERSION: "14.33.31629"
.windows_vcvarsall_vs2022_x86: .windows_vcvarsall_vs2022_x86:
variables: variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x86" VCVARSPLATFORM: "x86"
VCVARSVERSION: "14.32.31326" VCVARSVERSION: "14.33.31629"
.windows_vcvarsall_vs2022_x64_arm64: .windows_vcvarsall_vs2022_x64_arm64:
variables: variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64_arm64" VCVARSPLATFORM: "x64_arm64"
VCVARSVERSION: "14.32.31326" VCVARSVERSION: "14.33.31629"
.windows_vs2022_x64_ninja: .windows_vs2022_x64_ninja:
extends: extends:
@@ -98,7 +98,7 @@
CMAKE_CONFIGURATION: windows_vs2022_x64 CMAKE_CONFIGURATION: windows_vs2022_x64
CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64" CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.32.31326" CMAKE_GENERATOR_TOOLSET: "v143,version=14.33.31629"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2019_x64: .windows_vs2019_x64:
@@ -232,7 +232,7 @@
- windows - windows
- shell - shell
- vs2022 - vs2022
- msvc-19.32 - msvc-19.33
- nonconcurrent - nonconcurrent
.windows_tags_nonconcurrent_vs2022_arm64: .windows_tags_nonconcurrent_vs2022_arm64:
@@ -241,7 +241,7 @@
- windows - windows
- shell - shell
- vs2022 - vs2022
- msvc-19.32-arm64 - msvc-19.33-arm64
- nonconcurrent - nonconcurrent
.windows_tags_concurrent_vs2022: .windows_tags_concurrent_vs2022:
@@ -250,7 +250,7 @@
- windows - windows
- shell - shell
- vs2022 - vs2022
- msvc-19.32 - msvc-19.33
- concurrent - concurrent
.windows_tags_concurrent_vs2019: .windows_tags_concurrent_vs2019: