Add MSVC support

guillaumeLepape · Jan 3, 2024 · dae1d30 · dae1d30
1 parent 24e6d94
commit dae1d30
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 3 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml → .github/workflows/test.yml b/.github/workflows/cmake-multi-platform.yml → .github/workflows/test.yml
@@ -11,13 +11,18 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
+      fail-fast: false
+
       matrix:
         os: [ubuntu-latest, windows-latest]
-        compiler: [Clang, GCC]
+        compiler: [Clang, GCC, MSVC]
         build_type: [Debug, Release]
         exclude:
           - os: windows-latest
+            compiler: GCC
           - compiler: Clang
+          - os: ubuntu-latest
+            compiler: MSVC
 
     steps:
       - uses: actions/checkout@v4

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.21)
 
 # set the project name
 project(Elevation)

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -1,5 +1,10 @@
 {
-    "version": 2,
+    "version": 3,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 21,
+        "patch": 0
+    },
     "configurePresets": [
         {
             "name": "GCC-Debug",
@@ -56,6 +61,44 @@
                 "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
             }
+        },
+        {
+            "name": "MSVC-Debug",
+            "displayName": "Build with MSVC in debug mode",
+            "generator": "Visual Studio 16 2019",
+            "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Debug",
+                "CMAKE_CXX_COMPILER": "cl++",
+                "CMAKE_C_COMPILER": "cl",
+                "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            }
+        },
+        {
+            "name": "MSVC-Release",
+            "displayName": "Build with MSVC in release mode",
+            "generator": "Visual Studio 16 2019",
+            "binaryDir": "${sourceDir}/out/build/${presetName}",
+            "cacheVariables": {
+                "CMAKE_BUILD_TYPE": "Release",
+                "CMAKE_CXX_COMPILER": "cl++",
+                "CMAKE_C_COMPILER": "cl",
+                "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/vcpkg/scripts/buildsystems/vcpkg.cmake",
+                "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}",
+                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            }
         }
     ]
 }