rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drop unused patch

This commit is contained in:
Rex Dieter 2010-04-15 12:07:32 +00:00
parent 39f686838d
commit fcab8c27d8
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kdelibs-4.4.1-no_rpath.patch
View File

@ -1,21 +0,0 @@
diff -up kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-02-28 11:08:56.164016085 -0600
+++ kdelibs-4.4.1/cmake/modules/FindKDE4Internal.cmake 2010-02-28 11:10:20.126766912 -0600
@@ -947,7 +947,16 @@ if (UNIX)
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
else (APPLE)
# add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
+ # set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
+ message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}")
+ message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
+ list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} _LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
+ message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: ${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
+ if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
+ message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
+ list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
+ endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
+
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)