Auto PR - develop → MAPL-v3 - Updates for Spack Support, Round 2 #569
Conversation
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Due to insufficient grepping on my part, some remnants of the "non-canonical" CMake still remain. Apparently these were not necessary changes for Spack, but they are changes that unify the CMake style of GEOS to be more like "correct" CMake. In this go-around, it is mainly finding `INC_ESMF` which I apparently forgot to grep for last time (I was focused on NetCDF), and some non-canonical OpenMP calls. See GEOS-ESM/GEOSgcm#387 for the meta-issue.
…22Mar21 Updates for Spack Support, Round 2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
📝 Automatic PR:
develop→release/MAPL-v3Description
Updates for Spack Support, Round 2
Due to insufficient grepping on my part, some remnants of the
non-canonical CMake still remain. Apparently these were not necessary
changes for Spack, but they are changes that unify the CMake style of
GEOS to be more like correct CMake.
In this go-around, it is mainly finding
INC_ESMFwhich I apparentlyforgot to grep for last time (I was focused on NetCDF), and some
non-canonical OpenMP calls.
See GEOS-ESM/GEOSgcm#387 for the meta-issue.
📁 Modified files
CMakeLists.txt | 5 ++---
GEOSagcm_GridComp/CMakeLists.txt | 3 +--
GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt | 3 +--
.../GEOSmoist_GridComp/CMakeLists.txt | 3 +--
.../GEOSradiation_GridComp/CMakeLists.txt | 3 +--
.../GEOSsurface_GridComp/CMakeLists.txt | 5 ++---
.../GEOSsurface_GridComp/GEOSlake_GridComp/CMakeLists.txt | 3 +--
.../GEOSsurface_GridComp/GEOSland_GridComp/CMakeLists.txt | 5 ++---
.../GEOSland_GridComp/GEOScatchCN_GridComp/CMakeLists.txt | 7 +++----
.../GEOScatchCNCLM40_GridComp/CLM40/CMakeLists.txt | 2 +-
.../GEOScatchCNCLM40_GridComp/CMakeLists.txt | 2 +-
.../GEOScatchCNCLM45_GridComp/CLM45/CMakeLists.txt | 2 +-
.../GEOScatchCNCLM45_GridComp/CMakeLists.txt | 2 +-
.../GEOSland_GridComp/Shared/CMakeLists.txt | 3 +--
.../GEOSsurface_GridComp/Utils/mk_restarts/CMakeLists.txt | 15 ++++-----------
GEOSagcm_GridComp/GEOSsuperdyn_GridComp/CMakeLists.txt | 5 ++---
GEOSdataatm_GridComp/CMakeLists.txt | 3 +--
GEOSogcm_GridComp/CMakeLists.txt | 7 +++----
.../GEOS_OceanBioGeoChemGridComp/CMakeLists.txt | 3 +--
GEOSogcm_GridComp/GEOS_OradBioGridComp/CMakeLists.txt | 3 +--
GEOSogcm_GridComp/GEOSseaice_GridComp/CMakeLists.txt | 3 +--
.../GEOSCICEDyna_GridComp/CMakeLists.txt | 7 +++----
22 files changed, 35 insertions(+), 59 deletions(-)