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

gitlab-ci: Update Windows builds to MSVC 14.40 toolset

Browse Source
This commit is contained in:
Brad King
2024-05-29 09:31:06 -04:00
parent 41e777274a
commit 0070708ae1
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
.gitlab/os-windows.yml
View File

@@ -35,25 +35,25 @@
variables: variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64" VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.36.32532" VCVARSVERSION: "14.40.33807"
.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.36.32532" VCVARSVERSION: "14.40.33807"
.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.36.32532" VCVARSVERSION: "14.40.33807"
.windows_arm64_vcvarsall_vs2022: .windows_arm64_vcvarsall_vs2022:
variables: variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "arm64" VCVARSPLATFORM: "arm64"
VCVARSVERSION: "14.36.32532" VCVARSVERSION: "14.40.33807"
.windows_vs2022_x64_pch: .windows_vs2022_x64_pch:
extends: extends:
@@ -119,7 +119,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.36.32532" CMAKE_GENERATOR_TOOLSET: "v143,version=14.40.33807"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2019_x64: .windows_vs2019_x64:
@@ -282,7 +282,7 @@
CMAKE_CONFIGURATION: windows_arm64_vs2022 CMAKE_CONFIGURATION: windows_arm64_vs2022
CMAKE_GENERATOR: "Visual Studio 17 2022" CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "ARM64" CMAKE_GENERATOR_PLATFORM: "ARM64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.36.32532" CMAKE_GENERATOR_TOOLSET: "v143,version=14.40.33807"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true" CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.mingw_osdn_io: .mingw_osdn_io:
@@ -316,7 +316,7 @@
- windows-x86_64 - windows-x86_64
- shell - shell
- vs2022 - vs2022
- msvc-19.36 - msvc-14.40
- nonconcurrent - nonconcurrent
.windows_x86_64_tags_nonconcurrent_vs2022_arm64: .windows_x86_64_tags_nonconcurrent_vs2022_arm64:
@@ -325,7 +325,7 @@
- windows-x86_64 - windows-x86_64
- shell - shell
- vs2022 - vs2022
- msvc-19.36-arm64 - msvc-14.40-arm64
- nonconcurrent - nonconcurrent
.windows_x86_64_tags_concurrent_vs2022: .windows_x86_64_tags_concurrent_vs2022:
@@ -334,7 +334,7 @@
- windows-x86_64 - windows-x86_64
- shell - shell
- vs2022 - vs2022
- msvc-19.36 - msvc-14.40
- concurrent - concurrent
.windows_x86_64_tags_concurrent_vs2022_android: .windows_x86_64_tags_concurrent_vs2022_android:
@@ -344,7 +344,7 @@
- shell - shell
- vs2022 - vs2022
- vs17-android - vs17-android
- msvc-19.36 - msvc-14.40
- concurrent - concurrent
.windows_x86_64_tags_concurrent_vs2019_android: .windows_x86_64_tags_concurrent_vs2019_android:
@@ -370,7 +370,7 @@
- windows-arm64 - windows-arm64
- shell - shell
- vs2022 - vs2022
- msvc-19.36 - msvc-14.40
- nonconcurrent - nonconcurrent
.windows_arm64_tags_concurrent_vs2022: .windows_arm64_tags_concurrent_vs2022:
@@ -379,7 +379,7 @@
- windows-arm64 - windows-arm64
- shell - shell
- vs2022 - vs2022
- msvc-19.36 - msvc-14.40
- concurrent - concurrent
## Windows-specific scripts ## Windows-specific scripts