Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates for Spack Support, Round 2 #126

Merged
merged 3 commits into from
Mar 24, 2022

Conversation

mathomp4
Copy link
Member

Due to insufficient grepping on my part, some remnants of the
"not-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.

Due to insufficient grepping on my part, some remnants of the
"not-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.
@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Mar 21, 2022
@mathomp4 mathomp4 requested a review from a team as a code owner March 21, 2022 18:47
@mathomp4 mathomp4 self-assigned this Mar 21, 2022
@mathomp4 mathomp4 added the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Mar 21, 2022
@mathomp4 mathomp4 requested a review from a team as a code owner March 21, 2022 18:54
Copy link
Contributor

@tclune tclune left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cmake changes ok

@mathomp4 mathomp4 removed the Contingent - DNA Do Not Approve (DNA). These changes are contingent on other PRs label Mar 21, 2022
@mathomp4 mathomp4 requested a review from tclune March 21, 2022 18:55
@mathomp4
Copy link
Member Author

Whoops. Since #124 wasn't in yet, the CI here fails. So, I updated the components.yaml in this PR as well so that CI can pass.

Copy link
Collaborator

@amdasilva amdasilva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine.

@amdasilva amdasilva merged commit 7a9dae6 into develop Mar 24, 2022
@amdasilva amdasilva deleted the feature/mathomp4/spack-cmake-2022Mar21 branch March 24, 2022 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants