add BUILD_TESTING option, remove packaging

HDFGroup · Aug 16, 2023 · 2090140 · 2090140
1 parent fc5edb8
commit 2090140
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -14,6 +14,27 @@
         "BUILD_TESTING": "ON"
       }
     },
+    {
+      "name": "ci-StdJava",
+      "hidden": true,
+      "cacheVariables": {
+        "HDF_BUILD_JAVA": "ON"
+      }
+    },
+    {
+      "name": "ci-StdFortran",
+      "hidden": true,
+      "cacheVariables": {
+        "HDF_BUILD_FORTRAN": "ON"
+      }
+    },
+    {
+      "name": "ci-StdPlugins",
+      "hidden": true,
+      "cacheVariables": {
+        "HDF_BUILD_FILTERS": "ON"
+      }
+    },
     {
       "name": "ci-StdShar",
       "hidden": true,
@@ -98,49 +119,29 @@
       ]
     }
   ],
-  "packagePresets": [
-    {
-      "name": "ci-StdShar-MSVC",
-      "configurePreset": "ci-StdShar-MSVC",
-      "inherits": "ci-x64-Release-MSVC"
-    },
-    {
-      "name": "ci-StdShar-Clang",
-      "configurePreset": "ci-StdShar-Clang",
-      "inherits": "ci-x64-Release-Clang"
-    },
-    {
-      "name": "ci-StdShar-GNUC",
-      "configurePreset": "ci-StdShar-GNUC",
-      "inherits": "ci-x64-Release-GNUC"
-    }
-  ],
   "workflowPresets": [
     {
       "name": "ci-StdShar-MSVC",
       "steps": [
         {"type": "configure", "name": "ci-StdShar-MSVC"},
         {"type": "build", "name": "ci-StdShar-MSVC"},
-        {"type": "test", "name": "ci-StdShar-MSVC"},
-        {"type": "package", "name": "ci-StdShar-MSVC"}
+        {"type": "test", "name": "ci-StdShar-MSVC"}
       ]
     },
     {
       "name": "ci-StdShar-Clang",
       "steps": [
         {"type": "configure", "name": "ci-StdShar-Clang"},
         {"type": "build", "name": "ci-StdShar-Clang"},
-        {"type": "test", "name": "ci-StdShar-Clang"},
-        {"type": "package", "name": "ci-StdShar-Clang"}
+        {"type": "test", "name": "ci-StdShar-Clang"}
       ]
     },
     {
       "name": "ci-StdShar-GNUC",
       "steps": [
         {"type": "configure", "name": "ci-StdShar-GNUC"},
         {"type": "build", "name": "ci-StdShar-GNUC"},
-        {"type": "test", "name": "ci-StdShar-GNUC"},
-        {"type": "package", "name": "ci-StdShar-GNUC"}
+        {"type": "test", "name": "ci-StdShar-GNUC"}
       ]
     }
   ]

diff --git a/config/cmake-presets/hidden-presets.json b/config/cmake-presets/hidden-presets.json
@@ -4,7 +4,8 @@
     {
       "name": "ci-base",
       "displayName": "Basic Config",
-      "description": "Basic build using default generator",
+      "description": "Basic build using Ninja generator",
+      "generator": "Ninja",
       "hidden": true,
       "binaryDir": "${sourceParentDir}/build/${presetName}",
       "installDir": "${sourceParentDir}/install/${presetName}"