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

CMake components #339

Merged
merged 8 commits into from
Feb 21, 2024
Merged

CMake components #339

merged 8 commits into from
Feb 21, 2024

Conversation

rbberger
Copy link
Collaborator

@rbberger rbberger commented Jan 31, 2024

PR Summary

Rewrites the CMake targets and installation to split up Interface and Library components.

Closes #323

PR Checklist

  • Adds a test for any bugs fixed. Adds tests for new features.
  • Format your changes by using the make format command after configuring with cmake.
  • Document any new features, update documentation for changes made.
  • Make sure the copyright notice on any files you modified is up to date.
  • After creating a pull request, note it in the CHANGELOG.md file.
  • LANL employees: make sure tests pass both on the github CI and on the Darwin CI

If preparing for a new release, in addition please check the following:

  • Update the version in cmake.
  • Move the changes in the CHANGELOG.md file under a new header for the new release, and reset the categories.

@rbberger
Copy link
Collaborator Author

rbberger commented Feb 1, 2024

@dholladay00 looks like https://github.com/lanl/singularity-eos/blob/main/test/test_eos_modifiers.cpp is broken, since SINGULARITY_BUILD_CLOSURE was never passed on to the test code and therefore always ignored. Now that it's passed on the code shows that it's invalid in its current form.

@rbberger
Copy link
Collaborator Author

rbberger commented Feb 9, 2024

@mauneyc-LANL the CI fix was actually quite simple. All I needed was avoid the inclusion of the closure header.

@mauneyc-LANL
Copy link
Collaborator

@mauneyc-LANL the CI fix was actually quite simple. All I needed was avoid the inclusion of the closure header.

Looked simple, I will review once passes

@rbberger rbberger marked this pull request as ready for review February 9, 2024 21:38
@rbberger
Copy link
Collaborator Author

rbberger commented Feb 9, 2024

@jhp-lanl @Yurlungur tested this in the SAP integration branch.

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.

LGTM. Minor nitpick below, which I consider nonblocking. Also please modify changelog. And, if the instructions for linking to the library in downstream codes has changed, please update the docs.


target_sources(singularity-eos PRIVATE ${eos_srcs} ${eos_headers})
if(SINGULARITY_BUILD_CLOSURE)
Copy link
Collaborator

Choose a reason for hiding this comment

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

It might be best to have variable like BUILD_LIBRARY that (for now) automatically is set by BUILD_CLOSURE so that we can extend in the future if needed.

@mauneyc-LANL
Copy link
Collaborator

@rbberger a conflict popped up, I think with a change @jonahm-LANL made last week.

@mauneyc-LANL mauneyc-LANL merged commit c3e08cc into main Feb 21, 2024
4 checks passed
@mauneyc-LANL mauneyc-LANL deleted the cmake_components branch February 21, 2024 21:54
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.

How to best handle switch from header-only to compiled with/without fortran?
3 participants