Use includes to workaround CMake issues

GEOS-ESM · Feb 2, 2024 · 0ee7a08 · 0ee7a08
1 parent 531fcb0
commit 0ee7a08
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 29 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -1,38 +1,14 @@
 {
-  "version": 6,
+  "version": 7,
   "cmakeMinimumRequired": {
     "major": 3,
-    "minor": 26,
+    "minor": 27,
     "patch": 0
   },
+  "include": [
+    "presets/CMake$penv{CMAKE_SITE_NAME}Presets.json"
+  ],
   "configurePresets": [
-    {
-      "name": "base-configure-nccs",
-      "hidden": true,
-      "displayName": "Base Configure Settings",
-      "description": "Sets build and install directories",
-      "binaryDir": "$penv{CMAKE_BUILD_LOCATIONS}/${sourceDirName}/build-${presetName}",
-      "installDir": "$penv{CMAKE_INSTALL_LOCATIONS}/${sourceDirName}/install-${presetName}",
-      "condition": { "lhs": "$penv{CMAKE_SITE_NAME}", "type": "equals", "rhs": "NCCS" }
-    },
-    {
-      "name": "base-configure-default",
-      "hidden": true,
-      "displayName": "Base Configure Settings",
-      "description": "Sets build and install directories",
-      "binaryDir": "${sourceDir}/build-${presetName}",
-      "installDir": "${sourceDir}/install-${presetName}",
-      "condition": { "lhs": "$penv{CMAKE_SITE_NAME}", "type": "notEquals", "rhs": "NCCS" } },
-    {
-      "name": "base-configure",
-      "hidden": true,
-      "inherits": [
-         "base-configure-nccs",
-         "base-configure-default"
-         ],
-      "displayName": "Base Configure Settings",
-      "description": "Sets build and install directories"
-    },
     {
       "name": "base-gnu",
       "hidden": true,

diff --git a/presets/CMakeDefaultPresets.json b/presets/CMakeDefaultPresets.json
@@ -0,0 +1,13 @@
+{
+  "configurePresets": [
+    {
+      "name": "base-configure",
+      "hidden": true,
+      "displayName": "Base Configure Settings",
+      "description": "Sets build and install directories",
+      "binaryDir": "${sourceDir}/build-${presetName}",
+      "installDir": "${sourceDir}/install-${presetName}"
+    }
+  ],
+  "version": 7
+}
diff --git a/presets/CMakeNCCSPresets.json b/presets/CMakeNCCSPresets.json
@@ -0,0 +1,13 @@
+{
+  "configurePresets": [
+    {
+      "name": "base-configure",
+      "hidden": true,
+      "displayName": "Base Configure Settings",
+      "description": "Sets build and install directories",
+      "binaryDir": "$penv{CMAKE_BUILD_LOCATION}/${sourceDirName}/build-${presetName}",
+      "installDir": "$penv{CMAKE_INSTALL_LOCATION}/${sourceDirName}/install-${presetName}",
+    }
+  ],
+  "version": 7
+}