diff options
| author | Brad King <brad.king@kitware.com> | 2021-11-17 16:56:52 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-11-17 17:07:45 (GMT) |
| commit | bd00882f49e600d0da46aa85ebb50217e981d2dd (patch) | |
| tree | 914605edbb1858e0dbf6eb500db5948982be24fd /.gitlab/os-windows.yml | |
| parent | 99c335c8e812d38564e214bb4984d270417b2a5c (diff) | |
| download | CMake-bd00882f49e600d0da46aa85ebb50217e981d2dd.zip CMake-bd00882f49e600d0da46aa85ebb50217e981d2dd.tar.gz CMake-bd00882f49e600d0da46aa85ebb50217e981d2dd.tar.bz2 | |
gitlab-ci: Factor out windows_vcvarsall_vs2022_x64 config block
Isolate the vcvarsall variables in a dedicated block.
Diffstat (limited to '.gitlab/os-windows.yml')
| -rw-r--r-- | .gitlab/os-windows.yml | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml index bf75b6e..f2ded22 100644 --- a/.gitlab/os-windows.yml +++ b/.gitlab/os-windows.yml @@ -31,15 +31,20 @@ CMAKE_CI_BUILD_TYPE: Release CTEST_NO_WARNINGS_ALLOWED: 1 -.windows_vs2022_x64_ninja: - extends: .windows_ninja - +.windows_vcvarsall_vs2022_x64: variables: - CMAKE_CONFIGURATION: windows_vs2022_x64_ninja VCVARSALL: "${VS170COMNTOOLS}\\..\\..\\VC\\Auxiliary\\Build\\vcvarsall.bat" VCVARSPLATFORM: "x64" VCVARSVERSION: "14.30.30705" +.windows_vs2022_x64_ninja: + extends: + - .windows_ninja + - .windows_vcvarsall_vs2022_x64 + + variables: + CMAKE_CONFIGURATION: windows_vs2022_x64_ninja + ### External testing .windows_vs2022_x64: |