echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge topic 'ci-msvc-14.43' into release-4.0

Browse Source 
8353a88661 ci: Update Windows builds to MSVC 14.43 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10336
This commit is contained in:
Brad King 2025-02-13 14:28:01 +00:00 committed by Kitware Robot
commit 10da186af0
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.gitlab/os-windows.yml
View File

@ -35,25 +35,25 @@
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.42.34433"
VCVARSVERSION: "14.43.34808"
.windows_vcvarsall_vs2022_x86:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x86"
VCVARSVERSION: "14.42.34433"
VCVARSVERSION: "14.43.34808"
.windows_vcvarsall_vs2022_x64_arm64:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64_arm64"
VCVARSVERSION: "14.42.34433"
VCVARSVERSION: "14.43.34808"
.windows_arm64_vcvarsall_vs2022:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "arm64"
VCVARSVERSION: "14.42.34433"
VCVARSVERSION: "14.43.34808"
.windows_vs2022_x64_pch:
extends:
@ -119,7 +119,7 @@
CMAKE_CONFIGURATION: windows_vs2022_x64
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.42.34433"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2019_x64:
@ -282,7 +282,7 @@
CMAKE_CONFIGURATION: windows_arm64_vs2022
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "ARM64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.42.34433"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.mingw_osdn_io:
@ -316,7 +316,7 @@
- windows-x86_64
- shell
- vs2022
- msvc-14.42
- msvc-14.43
- nonconcurrent
.windows_x86_64_tags_nonconcurrent_vs2022_arm64:
@ -325,7 +325,7 @@
- windows-x86_64
- shell
- vs2022
- msvc-14.42-arm64
- msvc-14.43-arm64
- nonconcurrent
.windows_x86_64_tags_concurrent_vs2022:
@ -334,7 +334,7 @@
- windows-x86_64
- shell
- vs2022
- msvc-14.42
- msvc-14.43
- concurrent
.windows_x86_64_tags_concurrent_vs2022_android:
@ -344,7 +344,7 @@
- shell
- vs2022
- vs17-android
- msvc-14.42
- msvc-14.43
- concurrent
.windows_x86_64_tags_concurrent_vs2019_android:
@ -370,7 +370,7 @@
- windows-arm64
- shell
- vs2022
- msvc-14.42
- msvc-14.43
- nonconcurrent
.windows_arm64_tags_concurrent_vs2022:
@ -379,7 +379,7 @@
- windows-arm64
- shell
- vs2022
- msvc-14.42
- msvc-14.43
- concurrent
## Windows-specific scripts