Skip to content

Commit

Permalink
Use semicolons in manual RPATHs
Browse files Browse the repository at this point in the history
Colon separators works on Linux but apparently not on macOS. Using semicolons exposes the list structure to CMake whereas colons do not.
  • Loading branch information
nathanwbrei committed Aug 6, 2024
1 parent dd9a59d commit 4514739
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions cmake/AddExternalPlugin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ macro(add_jana_plugin plugin_name)
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/${INSTALL_NAMESPACE}/plugins
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib/${INSTALL_NAMESPACE}/plugins"
)

target_link_libraries(${plugin_name} PUBLIC JANA::jana2_static_lib)
Expand Down Expand Up @@ -55,7 +55,7 @@ macro(add_jana_plugin plugin_name)
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/${INSTALL_NAMESPACE}/plugins
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib/${INSTALL_NAMESPACE}/plugins"
)
install(TARGETS ${plugin_name}_tests RUNTIME DESTINATION bin)
add_test(NAME ${plugin_name}_tests COMMAND ${CMAKE_INSTALL_PREFIX}/bin/${plugin_name}_tests)
Expand Down
4 changes: 2 additions & 2 deletions cmake/AddInternalPlugin.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ macro(add_jana_plugin plugin_name)
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/JANA/plugins
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib/JANA/plugins"
)

target_link_libraries(${plugin_name} PUBLIC jana2_static_lib)
Expand Down Expand Up @@ -50,7 +50,7 @@ macro(add_jana_plugin plugin_name)
SKIP_BUILD_RPATH FALSE
BUILD_WITH_INSTALL_RPATH FALSE
INSTALL_RPATH_USE_LINK_PATH TRUE
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib:${CMAKE_INSTALL_PREFIX}/lib/JANA/plugins
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib;${CMAKE_INSTALL_PREFIX}/lib/JANA/plugins"
)
install(TARGETS ${plugin_name}_tests RUNTIME DESTINATION bin)
add_test(NAME ${plugin_name}_tests COMMAND ${CMAKE_INSTALL_PREFIX}/bin/jana-${plugin_name}-tests)
Expand Down

0 comments on commit 4514739

Please sign in to comment.