diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake index d0fe0f7f19b02b46a6814bdbc250979c42e8ded1..ba5404926083481a7c36dad8e88cf1267242445a 100644 --- a/scripts/cmake/ProjectSetup.cmake +++ b/scripts/cmake/ProjectSetup.cmake @@ -26,7 +26,15 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +# RPATH setup set(CMAKE_MACOSX_RPATH 1) +if(APPLE) + set(CMAKE_BUILD_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}") + set(CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}") +else() + set(CMAKE_BUILD_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") + set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") +endif() if(NOT IS_GIT_REPO) return() diff --git a/scripts/cmake/packaging/PackagingLinux.cmake b/scripts/cmake/packaging/PackagingLinux.cmake index 2e3a5d794cdbda1d8e454cf04d479cfa753a850e..c4434906174b6d5d84352e2c9f1d5bea420dade1 100644 --- a/scripts/cmake/packaging/PackagingLinux.cmake +++ b/scripts/cmake/packaging/PackagingLinux.cmake @@ -1,6 +1,4 @@ set(CPACK_GENERATOR TGZ) -# Adds the binaries location to the LD_LIBRARY_PATH -SET(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}") if(MODULE_CMD) message(STATUS "Found module cmd -> writing module file.") diff --git a/scripts/cmake/packaging/PackagingMac.cmake b/scripts/cmake/packaging/PackagingMac.cmake index 3c5fb14a10e9a0a2f1819fcd83ee3ace016fd16f..cf2c265c256ea92e15edd2af23255579a04a4344 100644 --- a/scripts/cmake/packaging/PackagingMac.cmake +++ b/scripts/cmake/packaging/PackagingMac.cmake @@ -13,8 +13,6 @@ set(CPACK_DMG_FORMAT "UDBZ") set(CPACK_DMG_BACKGROUND_IMAGE ${PROJECT_SOURCE_DIR}/Documentation/OpenGeoSys-Logo.png) set(CPACK_DMG_DS_STORE ${PROJECT_SOURCE_DIR}/scripts/packaging/.DS_Store) -SET(CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}") - if(OGS_USE_CONAN) file(GLOB MATCHED_FILES LIST_DIRECTORIES false "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.dylib*") install(FILES ${MATCHED_FILES} DESTINATION lib)