Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-14 02:08:27 +08:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
e37a40442a ci: Update Windows builds to MSVC 14.44 toolset
c955d5c31f ci: Tie Intel 2024.1 jobs on Windows to MSVC 14.43 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !10802
This commit is contained in:
Brad King
2025-05-21 12:23:36 +00:00
committed by Kitware Robot
parent 149b5830b6 e37a40442a
commit 81c7ed367c
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -1312,7 +1312,7 @@ t:windows-intel2021.9.0-ninja:
extends:
- .windows_intelclassic_ninja
- .cmake_test_windows_external
- .windows_x86_64_tags_concurrent_vs2022
- .windows_x86_64_tags_concurrent_vs2022_msvc14.43
- .cmake_junit_artifacts
- .run_dependent
needs:
@@ -1325,7 +1325,7 @@ t:windows-oneapi2024.1.0-ninja:
extends:
- .windows_inteloneapi_ninja
- .cmake_test_windows_external
- .windows_x86_64_tags_concurrent_vs2022
- .windows_x86_64_tags_concurrent_vs2022_msvc14.43
- .cmake_junit_artifacts
- .run_dependent
needs:

41
.gitlab/os-windows.yml
View File

@@ -31,29 +31,35 @@
CMAKE_CI_BUILD_TYPE: Release
CTEST_NO_WARNINGS_ALLOWED: 1
.windows_vcvarsall_vs2022_x64:
.windows_vcvarsall_vs2022_x64_msvc14.43:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.43.34808"
.windows_vcvarsall_vs2022_x64:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.44.35207"
.windows_vcvarsall_vs2022_x86:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x86"
VCVARSVERSION: "14.43.34808"
VCVARSVERSION: "14.44.35207"
.windows_vcvarsall_vs2022_x64_arm64:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64_arm64"
VCVARSVERSION: "14.43.34808"
VCVARSVERSION: "14.44.35207"
.windows_arm64_vcvarsall_vs2022:
variables:
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "arm64"
VCVARSVERSION: "14.43.34808"
VCVARSVERSION: "14.44.35207"
.windows_vs2022_x64_pch:
extends:
@@ -119,7 +125,7 @@
CMAKE_CONFIGURATION: windows_vs2022_x64
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.44.35207"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.windows_vs2019_x64:
@@ -232,7 +238,7 @@
.windows_intelclassic_ninja:
extends:
- .windows_ninja
- .windows_vcvarsall_vs2022_x64
- .windows_vcvarsall_vs2022_x64_msvc14.43
variables:
CMAKE_CONFIGURATION: windows_intelclassic_ninja
@@ -240,7 +246,7 @@
.windows_inteloneapi_ninja:
extends:
- .windows_ninja
- .windows_vcvarsall_vs2022_x64
- .windows_vcvarsall_vs2022_x64_msvc14.43
variables:
CMAKE_CONFIGURATION: windows_inteloneapi_ninja
@@ -282,7 +288,7 @@
CMAKE_CONFIGURATION: windows_arm64_vs2022
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "ARM64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.43.34808"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.44.35207"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
.mingw_osdn_io:
@@ -316,7 +322,7 @@
- windows-x86_64
- shell
- vs2022
- msvc-14.43
- msvc-14.44
- nonconcurrent
.windows_x86_64_tags_nonconcurrent_vs2022_arm64:
@@ -325,10 +331,19 @@
- windows-x86_64
- shell
- vs2022
- msvc-14.43-arm64
- msvc-14.44-arm64
- nonconcurrent
.windows_x86_64_tags_concurrent_vs2022:
tags:
- cmake # Since this is a bare runner, pin to a project.
- windows-x86_64
- shell
- vs2022
- msvc-14.44
- concurrent
.windows_x86_64_tags_concurrent_vs2022_msvc14.43:
tags:
- cmake # Since this is a bare runner, pin to a project.
- windows-x86_64
@@ -344,7 +359,7 @@
- shell
- vs2022
- vs17-android
- msvc-14.43
- msvc-14.44
- concurrent
.windows_x86_64_tags_concurrent_vs2019_android:
@@ -370,7 +385,7 @@
- windows-arm64
- shell
- vs2022
- msvc-14.43
- msvc-14.44
- nonconcurrent
.windows_arm64_tags_concurrent_vs2022:
@@ -379,7 +394,7 @@
- windows-arm64
- shell
- vs2022
- msvc-14.43
- msvc-14.44
- concurrent
## Windows-specific scripts