summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab/os-windows.yml13
1 files changed, 9 insertions, 4 deletions
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: