[soprano] rework rpath patch
Rex Dieter
rdieter at fedoraproject.org
Sun May 20 21:05:28 UTC 2012
commit 2dece41562f17a60df73466d56d09997a023402a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun May 20 16:07:41 2012 -0500
rework rpath patch
move CMAKE_INSTALL_RPATH_USE_LINK_PATH inside conditional
soprano-2.7.6-rpath.patch | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/soprano-2.7.6-rpath.patch b/soprano-2.7.6-rpath.patch
index 091d1b5..4c3b19b 100644
--- a/soprano-2.7.6-rpath.patch
+++ b/soprano-2.7.6-rpath.patch
@@ -1,16 +1,15 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ac2108f..cb26fb7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -142,8 +142,13 @@ set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig
+diff -up soprano-2.7.6/CMakeLists.txt.rpath soprano-2.7.6/CMakeLists.txt
+--- soprano-2.7.6/CMakeLists.txt.rpath 2012-05-16 03:36:35.000000000 -0500
++++ soprano-2.7.6/CMakeLists.txt 2012-05-20 16:00:01.675318069 -0500
+@@ -139,8 +139,13 @@ set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_IN
# 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_USE_LINK_PATH TRUE)
set(CMAKE_INSTALL_RPATH ${LIB_DESTINATION} )
+endif("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1")
More information about the scm-commits
mailing list