diff --git a/CMakePresets.json b/CMakePresets.json index b075b40..ab5d635 100644 --- 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,31 +119,13 @@ ] } ], - "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"} ] }, { @@ -130,8 +133,7 @@ "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"} ] }, { @@ -139,8 +141,7 @@ "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 index 90aa67d..9bd2eb0 100644 --- 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}"