Merge pull request #92 from EXP-code/CMakeUpdate

CMake config tweaks
EXP-code · Dec 16, 2024 · 04e4f5b · 04e4f5b
2 parents 181b8d1 + 52722e9
commit 04e4f5b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,6 +25,9 @@ endif()
 # Required compiler features
 add_compile_options(-D_REENTRANT)
 
+# Bake in library paths (esp. useful for HPC sites with modules)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
 # Check and enforce that we are a git repository.  Necessary for
 # submodules to work correctly.
 if(EXISTS "${PROJECT_SOURCE_DIR}/.git")

diff --git a/exputil/CMakeLists.txt b/exputil/CMakeLists.txt
@@ -51,9 +51,9 @@ set(common_INCLUDE_DIRS $<INSTALL_INTERFACE:include>
   ${DEP_INC} ${EIGEN3_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS}
   ${FFTW_INCLUDE_DIRS})
 
-set(common_LINKLIB ${DEP_LIB} OpenMP::OpenMP_CXX MPI::MPI_CXX
-  yaml-cpp ${VTK_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES}
-  ${FFTW_DOUBLE_LIB})
+set(common_LINKLIB ${DEP_LIB} OpenMP::OpenMP_CXX MPI::MPI_CXX yaml-cpp
+  ${VTK_LIBRARIES} ${HDF5_CXX_LIBRARIES} ${HDF5_LIBRARIES}
+  ${HDF5_HL_LIBRARIES} ${FFTW_DOUBLE_LIB})
 
 if(ENABLE_CUDA)
   list(APPEND common_LINKLIB CUDA::toolkit CUDA::cudart)