-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #933 from GEOS-ESM/develop
Merge develop into main for 2.8.1 release
- Loading branch information
Showing
19 changed files
with
641 additions
and
1,070 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,3 +7,4 @@ | |
/ESMA_env@/ | ||
/.mepo/ | ||
*.py.bak | ||
CMakeUserPresets.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,126 @@ | ||
{ | ||
"version": 3, | ||
"cmakeMinimumRequired": { | ||
"major": 3, | ||
"minor": 21, | ||
"patch": 0 | ||
}, | ||
"configurePresets": [ | ||
{ | ||
"name": "base-configure", | ||
"hidden": true, | ||
"displayName": "Base Configure Settings", | ||
"description": "Sets build and install directories", | ||
"binaryDir": "${sourceDir}/build-${presetName}", | ||
"cacheVariables": { | ||
"BASEDIR": "$env{BASEDIR}", | ||
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install-${presetName}", | ||
"CMAKE_BUILD_TYPE": "${presetName}" | ||
} | ||
}, | ||
{ | ||
"name": "base-gnu", | ||
"hidden": true, | ||
"inherits": "base-configure", | ||
"displayName": "Base GNU Make Config", | ||
"description": "Sets GNU Make generator", | ||
"generator": "Unix Makefiles" | ||
}, | ||
{ | ||
"name": "base-ninja", | ||
"hidden": true, | ||
"inherits": "base-configure", | ||
"displayName": "Base Ninja Config", | ||
"description": "Sets Ninja generator", | ||
"generator": "Ninja" | ||
}, | ||
{ | ||
"name": "Release", | ||
"inherits": "base-gnu", | ||
"displayName": "Release Configure", | ||
"description": "Release build using GNU Make generator" | ||
}, | ||
{ | ||
"name": "Debug", | ||
"inherits": "base-gnu", | ||
"displayName": "Debug Configure", | ||
"description": "Debug build using GNU Make generator" | ||
}, | ||
{ | ||
"name": "Aggressive", | ||
"inherits": "base-gnu", | ||
"displayName": "Aggressive Configure", | ||
"description": "Aggressive build using GNU Make generator" | ||
}, | ||
{ | ||
"name": "Release-Ninja", | ||
"inherits": "base-ninja", | ||
"displayName": "Release Ninja Configure", | ||
"description": "Release build using Ninja generator" | ||
}, | ||
{ | ||
"name": "Debug-Ninja", | ||
"inherits": "base-ninja", | ||
"displayName": "Debug Ninja Configure", | ||
"description": "Debug build using Ninja generator" | ||
}, | ||
{ | ||
"name": "Aggressive-Ninja", | ||
"inherits": "base-ninja", | ||
"displayName": "Aggressive Ninja Configure", | ||
"description": "Aggressive build using Ninja generator" | ||
} | ||
], | ||
"buildPresets": [ | ||
{ | ||
"name": "base-build", | ||
"hidden": true, | ||
"displayName": "Base Build Config", | ||
"description": "Sets default build options", | ||
"jobs": 6, | ||
"targets": ["install"] | ||
}, | ||
{ | ||
"name": "Release", | ||
"configurePreset": "Release", | ||
"inherits": "base-build", | ||
"displayName": "Release Build", | ||
"description": "Release build using GNU Make generator" | ||
}, | ||
{ | ||
"name": "Debug", | ||
"configurePreset": "Debug", | ||
"inherits": "base-build", | ||
"displayName": "Debug Build", | ||
"description": "Debug build using GNU Make generator" | ||
}, | ||
{ | ||
"name": "Aggressive", | ||
"configurePreset": "Aggressive", | ||
"inherits": "base-build", | ||
"displayName": "Aggressive Build", | ||
"description": "Aggressive build using GNU Make generator" | ||
}, | ||
{ | ||
"name": "Release-Ninja", | ||
"configurePreset": "Release-Ninja", | ||
"inherits": "base-build", | ||
"displayName": "Release Ninja Build", | ||
"description": "Release build using Ninja generator" | ||
}, | ||
{ | ||
"name": "Debug-Ninja", | ||
"configurePreset": "Debug-Ninja", | ||
"inherits": "base-build", | ||
"displayName": "Debug Ninja Build", | ||
"description": "Debug build using Ninja generator" | ||
}, | ||
{ | ||
"name": "Aggressive-Ninja", | ||
"configurePreset": "Aggressive-Ninja", | ||
"inherits": "base-build", | ||
"displayName": "Aggressive Ninja Build", | ||
"description": "Aggressive build using Ninja generator" | ||
} | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.