ci: Add AppVeyor testing support for C++20 and VS2022

g-truc · Sep 19, 2022 · 0455535 · 0455535
1 parent cc98465
commit 0455535
Showing 1 changed file with 31 additions and 5 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -9,10 +9,11 @@ configuration:
   - Release
 
 image:
-  - Visual Studio 2013
-  - Visual Studio 2015
-  - Visual Studio 2017
+  - Visual Studio 2022
   - Visual Studio 2019
+  - Visual Studio 2017
+  - Visual Studio 2015
+  - Visual Studio 2013
 
 environment:
   matrix:
@@ -21,6 +22,7 @@ environment:
     - GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON
     - GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_14=ON
     - GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_17=ON
+    - GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_20=ON
 
 matrix:
     exclude:
@@ -30,6 +32,8 @@ matrix:
       GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_14=ON
     - image: Visual Studio 2013
       GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_17=ON
+    - image: Visual Studio 2013
+      GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_20=ON
     - image: Visual Studio 2013
       configuration: Debug
     - image: Visual Studio 2015
@@ -38,6 +42,8 @@ matrix:
       GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_14=ON
     - image: Visual Studio 2015
       GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_17=ON
+    - image: Visual Studio 2015
+      GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_20=ON
     - image: Visual Studio 2015
       platform: x86
     - image: Visual Studio 2015
@@ -46,8 +52,14 @@ matrix:
       platform: x86
     - image: Visual Studio 2017
       configuration: Debug
+    - image: Visual Studio 2017
+      GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_20=ON
     - image: Visual Studio 2019
       platform: x64
+    - image: Visual Studio 2019
+      GLM_ARGUMENTS: -DGLM_TEST_ENABLE_SIMD_AVX=ON -DGLM_TEST_ENABLE_LANG_EXTENSIONS=ON -DGLM_TEST_ENABLE_CXX_20=ON
+    - image: Visual Studio 2019
+      platform: x86
 
 branches:
   only:
@@ -70,11 +82,25 @@ before_build:
       if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2019") {
           $env:generator="Visual Studio 16 2019"
       }
+      if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2022") {
+          $env:generator="Visual Studio 17 2022"
+      }
       if ($env:PLATFORM -eq "x64") {
-          $env:generator="$env:generator Win64"
+          if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2022" -or "$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2019") {
+              $env:arch="-A x64"
+          } else {
+              $env:generator="$env:generator Win64"
+              $env:arch=""
+          }
+      } else {
+          if ("$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2022" -or "$env:APPVEYOR_JOB_NAME" -match "Image: Visual Studio 2019") {
+              $env:arch="-A Win32"
+          } else {
+              $env:arch=""
+          }
       }
       echo generator="$env:generator"
-      cmake .. -G "$env:generator" -DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/install" -DGLM_QUIET=ON -DGLM_TEST_ENABLE=ON "$env:GLM_ARGUMENTS"
+      cmake .. -G "$env:generator" $env:arch -DCMAKE_INSTALL_PREFIX="$env:APPVEYOR_BUILD_FOLDER/install" -DGLM_QUIET=ON -DGLM_TEST_ENABLE=ON "$env:GLM_ARGUMENTS"
 
 build_script:
   - cmake --build . --parallel --config %CONFIGURATION% -- /m /v:minimal