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.

Sign up for GitHub

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

fix in-tree builds #340

Merged
merged 2 commits into from
Feb 11, 2024
Merged

fix in-tree builds #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27e0ca9
fix in-tree builds
jonahm-LANL Feb 10, 2024
5583cd9
changelog
jonahm-LANL Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
- [[PR#336]](https://github.com/lanl/singularity-eos/pull/336) Included code and documentation for a full, temperature consistent, Mie-Gruneisen EOS based on a pressure power law expansion in eta = 1-V/V0. PowerMG.

### Fixed (Repair bugs, etc)
- [[PR340]](https://github.com/lanl/singularity-eos/pull/335) Fix in-tree builds with plugin infrastructure
- [[PR335]](https://github.com/lanl/singularity-eos/pull/335) Fix missing hermite.hpp in CMake install required for Helmholtz EOS

### Added (new features/APIs/variables/...)
Expand Down
4 changes: 2 additions & 2 deletions cmake/plugins.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ function(register_headers)
get_property(install_headers GLOBAL PROPERTY _install_headers)

foreach(arg IN LISTS variadic_args)
file(RELATIVE_PATH relative_path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
file(RELATIVE_PATH relative_path ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
if (ARG_PLUGIN)
list(APPEND eos_headers ${relative_path}/${ARG_PLUGIN}/${arg})
list(APPEND install_headers ${ARG_PLUGIN}/${arg})
Expand All @@ -40,7 +40,7 @@ set_property(GLOBAL PROPERTY EOS_SRCS "")
function(register_srcs)
get_property(eos_srcs GLOBAL PROPERTY EOS_SRCS)
foreach(arg IN LISTS ARGN)
file(RELATIVE_PATH relative_path ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
file(RELATIVE_PATH relative_path ${PROJECT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
list(APPEND eos_srcs ${relative_path}/${arg})
endforeach()
set_property(GLOBAL PROPERTY EOS_SRCS "${eos_srcs}")
Expand Down
Loading