Add ninjamulti generator and fix ninja to be ninjasingle

PurpleFlowerGarden · Oct 20, 2023 · 6dc86a7 · 6dc86a7
1 parent 37941e0
commit 6dc86a7
Show file tree

Hide file tree

Showing 2 changed files with 118 additions and 1 deletion.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        generator: ['ninja']
+        generator: ['ninja', 'ninjamulti']
         vcpkg_target_triplet: ['x64-windows', 'x64-windows-static', 'x64-linux']
         build_type: ['debug', 'release']
         include:

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -38,6 +38,11 @@
     },
     {
       "name": "ninja",
+      "generator": "Ninja",
+      "hidden": true
+    },
+    {
+      "name": "ninjamulti",
       "generator": "Ninja Multi-Config",
       "hidden": true
     },
@@ -101,6 +106,38 @@
     {
       "name": "ci-ninja-x64-freebsd-debug",
       "inherits": ["ci", "ninja", "x64-freebsd", "debug"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-release",
+      "inherits": ["ci", "ninjamulti", "x64-windows", "release"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-debug",
+      "inherits": ["ci", "ninjamulti", "x64-windows", "debug"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-static-release",
+      "inherits": ["ci", "ninjamulti", "x64-windows-static", "release"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-static-debug",
+      "inherits": ["ci", "ninjamulti", "x64-windows-static", "debug"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-linux-release",
+      "inherits": ["ci", "ninjamulti", "x64-linux", "release"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-linux-debug",
+      "inherits": ["ci", "ninjamulti", "x64-linux", "debug"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-freebsd-release",
+      "inherits": ["ci", "ninjamulti", "x64-freebsd", "release"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-freebsd-debug",
+      "inherits": ["ci", "ninjamulti", "x64-freebsd", "debug"]
     }
   ],
   "buildPresets": [
@@ -153,6 +190,46 @@
       "name": "ci-ninja-x64-freebsd-release",
       "configurePreset": "ci-ninja-x64-freebsd-release",
       "configuration": "Release"
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-debug",
+      "configurePreset": "ci-ninjamulti-x64-windows-debug",
+      "configuration": "Debug"
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-release",
+      "configurePreset": "ci-ninjamulti-x64-windows-release",
+      "configuration": "Release"
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-static-debug",
+      "configurePreset": "ci-ninjamulti-x64-windows-static-debug",
+      "configuration": "Debug"
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-static-release",
+      "configurePreset": "ci-ninjamulti-x64-windows-static-release",
+      "configuration": "Release"
+    },
+    {
+      "name": "ci-ninjamulti-x64-linux-debug",
+      "configurePreset": "ci-ninjamulti-x64-linux-debug",
+      "configuration": "Debug"
+    },
+    {
+      "name": "ci-ninjamulti-x64-linux-release",
+      "configurePreset": "ci-ninjamulti-x64-linux-release",
+      "configuration": "Release"
+    },
+    {
+      "name": "ci-ninjamulti-x64-freebsd-debug",
+      "configurePreset": "ci-ninjamulti-x64-freebsd-debug",
+      "configuration": "Debug"
+    },
+    {
+      "name": "ci-ninjamulti-x64-freebsd-release",
+      "configurePreset": "ci-ninjamulti-x64-freebsd-release",
+      "configuration": "Release"
     }
   ],
   "testPresets": [
@@ -213,6 +290,46 @@
       "name": "ci-ninja-x64-freebsd-release",
       "configurePreset": "ci-ninja-x64-freebsd-release",
       "inherits": ["ci", "release"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-debug",
+      "configurePreset": "ci-ninjamulti-x64-windows-debug",
+      "inherits": ["ci", "debug"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-release",
+      "configurePreset": "ci-ninjamulti-x64-windows-release",
+      "inherits": ["ci", "release"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-static-debug",
+      "configurePreset": "ci-ninjamulti-x64-windows-static-debug",
+      "inherits": ["ci", "debug"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-windows-static-release",
+      "configurePreset": "ci-ninjamulti-x64-windows-static-release",
+      "inherits": ["ci", "release"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-linux-debug",
+      "configurePreset": "ci-ninjamulti-x64-linux-debug",
+      "inherits": ["ci", "debug"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-linux-release",
+      "configurePreset": "ci-ninjamulti-x64-linux-release",
+      "inherits": ["ci", "release"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-freebsd-debug",
+      "configurePreset": "ci-ninjamulti-x64-freebsd-debug",
+      "inherits": ["ci", "debug"]
+    },
+    {
+      "name": "ci-ninjamulti-x64-freebsd-release",
+      "configurePreset": "ci-ninjamulti-x64-freebsd-release",
+      "inherits": ["ci", "release"]
     }
   ]
 }