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

keep only CMAKE_INSTALL_RPATH_USE_LINK_PATH part of the patch for now,

Browse Source 
the rest is most likely no longer needed (will verify once we have some
initial builds to test)
This commit is contained in:
Rex Dieter 2010-05-21 12:24:24 +00:00
parent 1d1778983c
commit 50116d5bf6
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kdelibs-4.4.80-no_rpath.patch
View File

@ -6,15 +6,15 @@ diff -up kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir)
if("${_isSystemLibDir}" STREQUAL "-1")
- 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_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)
endif("${_isSystemLibDir}" STREQUAL "-1")
set(CMAKE_SKIP_BUILD_RPATH FALSE)