diff options
Diffstat (limited to 'source/l/strigi/libstreamanalyzer-0005-use-rpath-only-when-needed.patch')
-rw-r--r-- | source/l/strigi/libstreamanalyzer-0005-use-rpath-only-when-needed.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/source/l/strigi/libstreamanalyzer-0005-use-rpath-only-when-needed.patch b/source/l/strigi/libstreamanalyzer-0005-use-rpath-only-when-needed.patch deleted file mode 100644 index bcbf50bb..00000000 --- a/source/l/strigi/libstreamanalyzer-0005-use-rpath-only-when-needed.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 82c277bc0264798b291417e675611d7e3bead176 Mon Sep 17 00:00:00 2001 -From: Rex Dieter <rdieter@math.unl.edu> -Date: Wed, 1 Jan 2014 09:55:46 -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 6dee36b..d5cd1eb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -57,8 +57,13 @@ set(DATA_DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}") - # 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 WIN32 AND NOT CMAKE_SYSTEM MATCHES "SunOS-5*.") - add_definitions(-fPIC) --- -1.8.4.2 - |