From 27e0ca9d988978dea63fe4a46a3d86e9fee9725f Mon Sep 17 00:00:00 2001 From: Jonah Maxwell Miller Date: Sat, 10 Feb 2024 16:52:19 -0700 Subject: [PATCH 1/2] fix in-tree builds --- cmake/plugins.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/plugins.cmake b/cmake/plugins.cmake index 235b8830465..5b23f2476d4 100644 --- a/cmake/plugins.cmake +++ b/cmake/plugins.cmake @@ -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}) @@ -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}") From 5583cd957cca20aef6f37c4b41032fe079281051 Mon Sep 17 00:00:00 2001 From: Jonah Maxwell Miller Date: Sat, 10 Feb 2024 16:55:13 -0700 Subject: [PATCH 2/2] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c05220a8e77..8d3ff4ee28d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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/...)