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 Stack #462

Merged
merged 5 commits into from
Sep 22, 2022
Merged

Updates for Spack Stack #462

merged 5 commits into from
Sep 22, 2022

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Sep 20, 2022

This PR is needed for building GEOSgcm with spack-stack (see JCSDA/spack#174).

Here we update the main CMakeLists.txt for the case where Baselibs is not found so that all the needed find_package() and add_library(ALIAS) calls can be made. Testing shows that this is zero-diff.

I've also added a test for the esmf_ROOT environment variable that Spack creates and use that to find the FindESMF.cmake file. Not perfect, but now when building by hand you don't have to do -DCMAKE_MODULE_PATH=${esmf_ROOT}/cmake.

Also, this adds a smidge of the changes needed for FMS-in-spack. I can't turn this on by default due to changes that are needed in fvdycore (see GEOS-ESM/GFDL_atmos_cubed_sphere#51). As this is an interface change, we have to go whole-hog into it.

Related PRs that are NOT necessary, just future proofing for FMS-in-Baselibs/FMS-in-spack:

(And there is also GEOS-ESM/ESMA_env#82 but this is going to be a ways away...)

@mathomp4 mathomp4 added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Sep 20, 2022
@mathomp4 mathomp4 self-assigned this Sep 20, 2022
@mathomp4 mathomp4 added the Contingent - DNA These changes are contingent on other PRs label Sep 21, 2022
@mathomp4 mathomp4 marked this pull request as ready for review September 21, 2022 13:09
@mathomp4 mathomp4 requested review from a team as code owners September 21, 2022 13:09
@mathomp4 mathomp4 removed the Contingent - DNA These changes are contingent on other PRs label Sep 21, 2022
@sdrabenh sdrabenh merged commit b0b45ed into main Sep 22, 2022
@sdrabenh sdrabenh deleted the feature/mathomp4/spack-stack branch September 22, 2022 15:25
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.

3 participants