Merge pull request #340 from lanl/jmm/fix-plugins-for-in-tree

fix in-tree builds

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/...)

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}")