From bd00882f49e600d0da46aa85ebb50217e981d2dd Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Wed, 17 Nov 2021 11:56:52 -0500
Subject: gitlab-ci: Factor out windows_vcvarsall_vs2022_x64 config block

Isolate the vcvarsall variables in a dedicated block.
---
 .gitlab/os-windows.yml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to '.gitlab/os-windows.yml')

diff --git a/.gitlab/os-windows.yml b/.gitlab/os-windows.yml
index bf75b6e730..f2ded225f5 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:
-- 
cgit v1.2.1