add preset for pipeline client build

zerotacg · Jun 13, 2024 · d8e2f88 · d8e2f88
1 parent ed7aba5
commit d8e2f88
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 10 deletions.
diff --git a/.github/workflows/build-client.yml b/.github/workflows/build-client.yml
@@ -29,17 +29,19 @@ jobs:
          - macos-11
         include:
           - os: windows-2022
-            cmake_options: -DWITH_DRIVER_DIRECT3D=ON -DWITH_DRIVER_XAUDIO2=ON
+            cmake_preset: windows-client
           - os: windows-2019
-            cmake_options: -DWITH_DRIVER_DIRECT3D=ON -DWITH_DRIVER_XAUDIO2=ON
+            cmake_preset: windows-client
           - os: ubuntu-22.04
             ubuntu_version: 22.04
+            cmake_preset: linux-client
           - os: ubuntu-20.04
             ubuntu_version: 20.04
+            cmake_preset: linux-client
           - os: macos-14
-            cmake_options: -DWITH_LIBXML2_ICONV=OFF -GXcode
+            cmake_preset: macos-client
           - os: macos-11
-            cmake_options: -DWITH_LIBXML2_ICONV=OFF -GXcode
+            cmake_preset: macos-client
 
     steps:
     - uses: actions/checkout@v4
@@ -98,8 +100,7 @@ jobs:
 
     - name: Configure CMake
       run: >
-        cmake --preset client
-        ${{ matrix.cmake_options }}
+        cmake --preset ${{ matrix.cmake_preset }}
         -DHUNTER_CONFIGURATION_TYPES=Release
         -DHUNTER_ENABLED=ON
         -DHUNTER_ROOT=${{ steps.strings.outputs.hunter-dir }}

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -4,13 +4,39 @@
     {
       "name": "base",
       "hidden": true,
-      "generator": "Ninja Multi-Config",
       "binaryDir": "${sourceDir}/build"
     },
     {
-      "inherits": [
-        "base"
-      ],
+      "name": "linux",
+      "inherits": "base",
+      "generator": "Ninja Multi-Config",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
+      }
+    },
+    {
+      "name": "windows",
+      "inherits": "base",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
+      }
+    },
+    {
+      "name": "macos",
+      "inherits": "base",
+      "generator": "Xcode",
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
+      }
+    },
+    {
+      "inherits": "base",
       "name": "default",
       "cacheVariables": {
         "WITH_STATIC": true,
@@ -57,6 +83,34 @@
         "WITH_RYZOM_SERVER": false,
         "WITH_RYZOM_TOOLS": false
       }
+    },
+    {
+      "inherits": [
+        "linux",
+        "client"
+      ],
+      "name": "linux-client"
+    },
+    {
+      "inherits": [
+        "windows",
+        "client"
+      ],
+      "name": "windows-client",
+      "cacheVariables": {
+        "WITH_DRIVER_DIRECT3D": true,
+        "WITH_DRIVER_XAUDIO2": true
+      }
+    },
+    {
+      "inherits": [
+        "macos",
+        "client"
+      ],
+      "name": "macos-client",
+      "cacheVariables": {
+        "WITH_LIBXML2_ICONV": false
+      }
     }
   ],
   "buildPresets": [