mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 23:00:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-3.22-ci-msvc-19.31' into release-3.22

Browse Source 
Merge-request: !7059
This commit is contained in:
Brad King
2022-03-09 12:59:55 -05:00
parent 90a9bff01e e66de43180
commit dfdcb4fc3d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitlab/os-windows.yml
View File

@@ -38,7 +38,7 @@
CMAKE_CONFIGURATION: windows_vs2022_x64_ninja
VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.30.30705"
VCVARSVERSION: "14.31.31103"
### External testing
@@ -49,7 +49,7 @@
CMAKE_CONFIGURATION: windows_vs2022_x64
CMAKE_GENERATOR: "Visual Studio 17 2022"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.30.30705"
CMAKE_GENERATOR_TOOLSET: "v143,version=14.31.31103"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
## Tags
@@ -60,7 +60,7 @@
- windows
- shell
- vs2022
- msvc-19.30
- msvc-19.31
- nonconcurrent
.windows_tags_concurrent_vs2022:
@@ -69,7 +69,7 @@
- windows
- shell
- vs2022
- msvc-19.30
- msvc-19.31
- concurrent
## Windows-specific scripts