diff options
Diffstat (limited to 'source/l/strigi/libstreams-0005-use-rpath-only-when-needed.patch')
| -rw-r--r-- | source/l/strigi/libstreams-0005-use-rpath-only-when-needed.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/source/l/strigi/libstreams-0005-use-rpath-only-when-needed.patch b/source/l/strigi/libstreams-0005-use-rpath-only-when-needed.patch new file mode 100644 index 000000000..9a79c13bb --- /dev/null +++ b/source/l/strigi/libstreams-0005-use-rpath-only-when-needed.patch @@ -0,0 +1,31 @@ +From f552becab291908030f8cc27de83155eb182c7ba Mon Sep 17 00:00:00 2001 +From: Rex Dieter <rdieter@math.unl.edu> +Date: Wed, 1 Jan 2014 09:53:44 -0600 +Subject: [PATCH 5/5] use rpath only when needed + +cmake code borrowed from soprano +--- + CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b2d959c..a3948c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,8 +34,13 @@ set(INCLUDE_DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}") + # These two options below make it set the RPATH of the installed targets to all + # RPATH directories outside the current CMAKE_BINARY_DIR and also the library + # install directory. Alex ++list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemPlatformLibDir) ++list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCLibDir) ++list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_DESTINATION}" _isSystemCxxLibDir) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) ++if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1") + set(CMAKE_INSTALL_RPATH ${LIB_DESTINATION}) ++endif() + + if(NOT MSVC AND NOT MINGW AND NOT CMAKE_SYSTEM MATCHES "SunOS-5*.") + add_definitions(-fPIC) +-- +1.8.4.2 + |