Merge pull request #1321 from GEOS-ESM/feature/mathomp4/fix-cmakepres…

…ets-mapl Fix issue with Ninja presets
GEOS-ESM · Jan 27, 2022 · 96f4916 · 96f4916
2 parents 392031b + 91c8e64
commit 96f4916
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed issue in `CMakePresets.json` where Ninja presets were broken
+
 ### Added
 
 ### Changed

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -14,8 +14,7 @@
       "binaryDir": "${sourceDir}/build-${presetName}",
       "cacheVariables": {
         "BASEDIR": "$env{BASEDIR}",
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install-${presetName}",
-        "CMAKE_BUILD_TYPE": "${presetName}"
+        "CMAKE_INSTALL_PREFIX": "${sourceDir}/install-${presetName}"
       }
     },
     {
@@ -38,37 +37,55 @@
       "name": "Release",
       "inherits": "base-gnu",
       "displayName": "Release Configure",
-      "description": "Release build using GNU Make generator"
+      "description": "Release build using GNU Make generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
     },
     {
       "name": "Debug",
       "inherits": "base-gnu",
       "displayName": "Debug Configure",
-      "description": "Debug build using GNU Make generator"
+      "description": "Debug build using GNU Make generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
     },
     {
       "name": "Aggressive",
       "inherits": "base-gnu",
       "displayName": "Aggressive Configure",
-      "description": "Aggressive build using GNU Make generator"
+      "description": "Aggressive build using GNU Make generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Aggressive"
+      }
     },
     {
       "name": "Release-Ninja",
       "inherits": "base-ninja",
       "displayName": "Release Ninja Configure",
-      "description": "Release build using Ninja generator"
+      "description": "Release build using Ninja generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
     },
     {
       "name": "Debug-Ninja",
       "inherits": "base-ninja",
       "displayName": "Debug Ninja Configure",
-      "description": "Debug build using Ninja generator"
+      "description": "Debug build using Ninja generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
     },
     {
       "name": "Aggressive-Ninja",
       "inherits": "base-ninja",
       "displayName": "Aggressive Ninja Configure",
-      "description": "Aggressive build using Ninja generator"
+      "description": "Aggressive build using Ninja generator",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Aggressive"
+      }
     }
   ],
   "buildPresets": [