diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-11 17:11:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-11-11 18:12:42 (GMT) |
| commit | b63a87582f7fa936881e13407a106700eb20d2de (patch) | |
| tree | 88a8e7769fd17445e7b097825fe06cf0ed5a6e27 /.gitlab/ci | |
| parent | 39bdb1e33272c7f9b94d879b44cc23ae6395f036 (diff) | |
| download | CMake-b63a87582f7fa936881e13407a106700eb20d2de.zip CMake-b63a87582f7fa936881e13407a106700eb20d2de.tar.gz CMake-b63a87582f7fa936881e13407a106700eb20d2de.tar.bz2 | |
gitlab-ci: Update Windows jobs to VS 2022
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_windows_vs2022_x64.cmake (renamed from .gitlab/ci/configure_windows_vs2019_x64.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_vs2022_x64_ninja.cmake (renamed from .gitlab/ci/configure_windows_vs2019_x64_ninja.cmake) | 0 | ||||
| -rw-r--r-- | .gitlab/ci/download_qt.cmake | 3 |
3 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/ci/configure_windows_vs2019_x64.cmake b/.gitlab/ci/configure_windows_vs2022_x64.cmake index f6ece57..f6ece57 100644 --- a/.gitlab/ci/configure_windows_vs2019_x64.cmake +++ b/.gitlab/ci/configure_windows_vs2022_x64.cmake diff --git a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake index e1ae81e..e1ae81e 100644 --- a/.gitlab/ci/configure_windows_vs2019_x64_ninja.cmake +++ b/.gitlab/ci/configure_windows_vs2022_x64_ninja.cmake diff --git a/.gitlab/ci/download_qt.cmake b/.gitlab/ci/download_qt.cmake index 3990430..5940a28 100644 --- a/.gitlab/ci/download_qt.cmake +++ b/.gitlab/ci/download_qt.cmake @@ -18,7 +18,8 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "windows") set(msvc_year "2015") set(qt_abi "win64_msvc${msvc_year}_64") elseif ("$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2017" OR - "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019") + "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2019" OR + "$ENV{CMAKE_CONFIGURATION}" MATCHES "vs2022") set(qt_platform "windows_x86") set(msvc_year "2019") set(qt_abi "win64_msvc${msvc_year}_64") |