openharmony/third_party_cmake
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_cmake.git synced 2026-07-19 20:43:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ci-msvc-14.28-16.9' into release-3.20

Browse Source 
8c2aa8a881 Merge branch 'backport-3.19-ci-msvc-14.28-16.9' into ci-msvc-14.28-16.9
e8e2f2c511 gitlab-ci: Update Windows builds to MSVC 19.28-16.9 toolset

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5935
This commit is contained in:
Brad King
2021-03-24 20:43:54 +00:00
committed by Kitware Robot
parent 72a25fd2c1 8c2aa8a881
commit da221eb2dd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/os-windows.yml
+4 -4
View File
@@ -38,7 +38,7 @@
CMAKE_CONFIGURATION: windows_vs2019_x64_ninja
VCVARSALL: "${VS160COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat"
VCVARSPLATFORM: "x64"
VCVARSVERSION: "14.28.29333"
VCVARSVERSION: "14.28.29910"
### External testing
@@ -49,7 +49,7 @@
CMAKE_CONFIGURATION: windows_vs2019_x64
CMAKE_GENERATOR: "Visual Studio 16 2019"
CMAKE_GENERATOR_PLATFORM: "x64"
CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29333"
CMAKE_GENERATOR_TOOLSET: "v142,version=14.28.29910"
CMAKE_CI_NIGHTLY_IGNORE_DEPS: "true"
## Tags
@@ -60,7 +60,7 @@
- windows
- shell
- vs2019
- msvc-19.28
- msvc-19.28-16.9
- nonconcurrent
.windows_builder_ext_tags:
@@ -69,7 +69,7 @@
- windows
- shell
- vs2019
- msvc-19.28
- msvc-19.28-16.9
- concurrent
## Windows-specific scripts