Blob Blame History Raw
diff -up kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath	2010-02-02 08:56:04.117624211 -0600
+++ kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake	2010-02-02 09:51:15.752373945 -0600
@@ -947,10 +947,19 @@ 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)
+      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
    endif (APPLE)
 endif (UNIX)