From 9c7eee39a2241824043abb2dcd467d0f97d28a4e Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 20 Jan 2020 11:26:26 +0100
Subject: [PATCH] [CMake] Added setup of CMAKE_BUILD_RPATH.
Should fix runtime issues with mfront dylibs.
---
scripts/cmake/ProjectSetup.cmake | 8 ++++++++
scripts/cmake/packaging/PackagingLinux.cmake | 2 --
scripts/cmake/packaging/PackagingMac.cmake | 2 --
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/scripts/cmake/ProjectSetup.cmake b/scripts/cmake/ProjectSetup.cmake
index d0fe0f7f19b..ba540492608 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 2e3a5d794cd..c4434906174 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 3c5fb14a10e..cf2c265c256 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)
--
GitLab