Try to use MSVC compiler

Pika-Software · Nov 21, 2024 · aceca0b · aceca0b
1 parent c2c91ee
commit aceca0b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,9 +27,10 @@ jobs:
         include:
           - os: windows-latest
             arch: x64
+            CMAKE_ARCH_FLAG: --preset=x64-windows
           - os: windows-latest
             arch: x86
-            CMAKE_ARCH_FLAG: -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32" -DVCPKG_TARGET_TRIPLET=x86-windows
+            CMAKE_ARCH_FLAG: --preset=x86-windows
           - os: ubuntu-20.04
             arch: x86
             CMAKE_ARCH_FLAG: -DCMAKE_C_FLAGS="-m32" -DCMAKE_CXX_FLAGS="-m32" -DVCPKG_TARGET_TRIPLET=x86-linux

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -3,12 +3,26 @@
     "configurePresets": [
         {
             "name": "vcpkg",
-            "generator": "Ninja",
             "binaryDir": "${sourceDir}/build",
             "cacheVariables": {
                 "CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
                 "BUILD_SHARED_LIBS": "OFF"
             }
+        },
+        {
+            "name": "x64-windows",
+            "inherits": "vcpkg",
+            "architecture": "x64"
+        },
+        {
+            "name": "x86-windows",
+            "inherits": "vcpkg",
+            "architecture": "x86"
+        },
+        {
+            "name": "unix",
+            "inherits": "vcpkg",
+            "generator": "Ninja"
         }
     ]
 }