Mirror/FairLogger
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairLogger.git synced 2025-10-15 09:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Release 1.5.0-1

Browse Source
This commit is contained in:
Dennis Klein
2019-08-09 20:44:10 +02:00
parent 9949e83a14
commit 54e0ac2a83
12 changed files with 166 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
debian/patches/0002-CMake-Disable-relative-install-RPATH.patch vendored Normal file
View File

@@ -0,0 +1,26 @@
From: Dennis Klein <d.klein@gsi.de>
Date: Fri, 9 Aug 2019 22:18:31 +0200
Subject: CMake: Disable relative install RPATH
---
cmake/FairLoggerLib.cmake | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/cmake/FairLoggerLib.cmake b/cmake/FairLoggerLib.cmake
index ca4f52f..d15d163 100644
--- a/cmake/FairLoggerLib.cmake
+++ b/cmake/FairLoggerLib.cmake
@@ -131,11 +131,9 @@ macro(set_fairlogger_defaults)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} "-Wl,--enable-new-dtags")
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-Wl,--enable-new-dtags")
- set(CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
+ # set(CMAKE_INSTALL_RPATH "$ORIGIN/../${PROJECT_INSTALL_LIBDIR}")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
- set(CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
- else()
- set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PROJECT_INSTALL_LIBDIR}")
+ # set(CMAKE_INSTALL_RPATH "@loader_path/../${PROJECT_INSTALL_LIBDIR}")
endif()
endif()