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

Change cmake module append to use PROJECT_ insteand of CMAKE_ #296

Merged
merged 3 commits into from
Aug 23, 2023

Conversation

mauneyc-LANL
Copy link
Collaborator

@mauneyc-LANL mauneyc-LANL commented Aug 23, 2023

PR Summary

@jdolence reported an issue downstream when building as submodule !294. The issue was that in submodule mode, CMAKE_SOURCE_DIR was pointing to the top-level project's directory and not the singularity-eos directory, leading to list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") not pointing to anything useful.

Using PROJECT_SOURCE_DIR corrects this by using the proper path to the singularity-eos source dir.

PR Checklist

  • After creating a pull request, note it in the CHANGELOG.md file

Copy link
Collaborator

@Yurlungur Yurlungur left a comment

Choose a reason for hiding this comment

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

I want to double check this works downstream, then will merge. Thanks for the fix!

@Yurlungur
Copy link
Collaborator

Fix works. Tests pass. Merging.

@Yurlungur Yurlungur merged commit d95bece into main Aug 23, 2023
4 checks passed
@Yurlungur Yurlungur deleted the mauneyc/fix-submodule-cmake-dir branch August 23, 2023 23:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants