Makes CMAKE_INSTALL_RPATH_USE_LINK_PATH and CMAKE_INSTALL_RPATH cache…

… variables to improve compatibility with Spack
flux-framework · Oct 18, 2024 · 23601e4 · 23601e4
1 parent 98fb978
commit 23601e4
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 10 deletions.
diff --git a/cmake/modules/SetupCompiler.cmake b/cmake/modules/SetupCompiler.cmake
@@ -189,9 +189,9 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
 # Add the automatically determined parts of the RPATH
 # which point to directories outside the build tree to the install RPATH
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOL "")
 
-set(CMAKE_INSTALL_RPATH "${DYAD_INSTALL_LIBDIR}")
+set(CMAKE_INSTALL_RPATH "${DYAD_INSTALL_LIBDIR}" CACHE STRING "")
 
 list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
     "${DYAD_INSTALL_LIBDIR}" _IS_SYSTEM_DIR)

diff --git a/src/dyad/core/CMakeLists.txt b/src/dyad/core/CMakeLists.txt
@@ -21,8 +21,6 @@ set(DYAD_CTX_PRIVATE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/dyad_ctx.h
 
 add_library(${PROJECT_NAME}_core SHARED ${DYAD_CORE_SRC}
             ${DYAD_CORE_PUBLIC_HEADERS} ${DYAD_CORE_PRIVATE_HEADERS})
-# set_target_properties(${PROJECT_NAME}_core PROPERTIES CMAKE_INSTALL_RPATH
-#                       "${DYAD_INSTALL_LIBDIR}")
 target_link_libraries(${PROJECT_NAME}_core PRIVATE Jansson::Jansson flux::core)
 target_link_libraries(${PROJECT_NAME}_core PRIVATE ${PROJECT_NAME}_ctx ${PROJECT_NAME}_utils
                       ${PROJECT_NAME}_murmur3 ${PROJECT_NAME}_dtl)

diff --git a/src/dyad/dtl/CMakeLists.txt b/src/dyad/dtl/CMakeLists.txt
@@ -28,8 +28,6 @@ endif()
 
 add_library(${PROJECT_NAME}_dtl SHARED ${DTL_SRC} ${DTL_PUBLIC_HEADERS} ${DTL_PRIVATE_HEADERS})
 target_link_libraries(${PROJECT_NAME}_dtl PRIVATE ${PROJECT_NAME}_utils Jansson::Jansson flux::core flux::optparse)
-# set_target_properties(${PROJECT_NAME}_dtl PROPERTIES CMAKE_INSTALL_RPATH
-#                       "${DYAD_INSTALL_LIBDIR}")
 
 if(DYAD_ENABLE_UCX_DTL OR DYAD_ENABLE_UCX_DATA_RMA)
     target_link_libraries(${PROJECT_NAME}_dtl PRIVATE ucx::ucp ucx::ucs)

diff --git a/src/dyad/modules/CMakeLists.txt b/src/dyad/modules/CMakeLists.txt
@@ -14,8 +14,6 @@ set(DYAD_MODULE_PUBLIC_HEADERS)
 add_library(${PROJECT_NAME} SHARED ${DYAD_MODULE_SRC}
             ${DYAD_MODULE_PRIVATE_HEADERS} ${DYAD_MODULE_PUBLIC_HEADERS})
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-# set_target_properties(${PROJECT_NAME} PROPERTIES CMAKE_INSTALL_RPATH
-#                       "${DYAD_INSTALL_LIBDIR}")
 target_link_libraries(${PROJECT_NAME} PRIVATE Jansson::Jansson)
 target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAME}_dtl)
 target_link_libraries(${PROJECT_NAME} PRIVATE ${PROJECT_NAME}_ctx)

diff --git a/src/dyad/stream/CMakeLists.txt b/src/dyad/stream/CMakeLists.txt
@@ -11,8 +11,6 @@ set(DYAD_FSTREAM_PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/dya
 
 add_library(${PROJECT_NAME}_fstream SHARED ${DYAD_FSTREAM_SRC}
             ${DYAD_FSTREAM_PRIVATE_HEADERS} ${DYAD_FSTREAM_PUBLIC_HEADERS})
-# set_target_properties(${PROJECT_NAME}_fstream PROPERTIES CMAKE_INSTALL_RPATH
-#                       "${DYAD_INSTALL_LIBDIR}")
 target_compile_features(${PROJECT_NAME}_fstream PRIVATE)
 target_link_libraries(${PROJECT_NAME}_fstream PRIVATE ${PROJECT_NAME}_ctx ${PROJECT_NAME}_core
                                                       ${PROJECT_NAME}_utils flux::core)