Skip to content
Snippets Groups Projects
Commit 9c7eee39 authored by Lars Bilke's avatar Lars Bilke
Browse files

[CMake] Added setup of CMAKE_BUILD_RPATH.

Should fix runtime issues with mfront dylibs.
parent 916d9508
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,15 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) ...@@ -26,7 +26,15 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR})
# RPATH setup
set(CMAKE_MACOSX_RPATH 1) 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) if(NOT IS_GIT_REPO)
return() return()
......
set(CPACK_GENERATOR TGZ) set(CPACK_GENERATOR TGZ)
# Adds the binaries location to the LD_LIBRARY_PATH
SET(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")
if(MODULE_CMD) if(MODULE_CMD)
message(STATUS "Found module cmd -> writing module file.") message(STATUS "Found module cmd -> writing module file.")
......
...@@ -13,8 +13,6 @@ set(CPACK_DMG_FORMAT "UDBZ") ...@@ -13,8 +13,6 @@ set(CPACK_DMG_FORMAT "UDBZ")
set(CPACK_DMG_BACKGROUND_IMAGE ${PROJECT_SOURCE_DIR}/Documentation/OpenGeoSys-Logo.png) 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(CPACK_DMG_DS_STORE ${PROJECT_SOURCE_DIR}/scripts/packaging/.DS_Store)
SET(CMAKE_INSTALL_RPATH "@executable_path/../${CMAKE_INSTALL_LIBDIR}")
if(OGS_USE_CONAN) if(OGS_USE_CONAN)
file(GLOB MATCHED_FILES LIST_DIRECTORIES false "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.dylib*") file(GLOB MATCHED_FILES LIST_DIRECTORIES false "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/*.dylib*")
install(FILES ${MATCHED_FILES} DESTINATION lib) install(FILES ${MATCHED_FILES} DESTINATION lib)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment