From: Alexander Neundorf From: Modestas Vainius Subject: don't set the install RPATH to LIB_INSTALL_DIR don't set the install RPATH to LIB_INSTALL_DIR if LIB_INSTALL_DIR is one of the standard system link directories, like e.g. /usr/lib (which are listed in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES, which is set in Modules/Platform/UnixPaths.cmake). . Also drop custom INSTALL_RPATHs in kdewidgets/CMakeLists.txt. Forwarded: yes Origin: backport, http://websvn.kde.org/?view=revision&revision=1124215 Last-Update: 2011-01-30 --- a/kdewidgets/CMakeLists.txt +++ b/kdewidgets/CMakeLists.txt @@ -51,7 +51,6 @@ if(QT_QTDESIGNER_FOUND) INSTALL_RPATH_USE_LINK_PATH TRUE SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH ${LIB_INSTALL_DIR} ) endif(NOT WIN32) @@ -81,7 +80,6 @@ if(QT_QTDESIGNER_FOUND) INSTALL_RPATH_USE_LINK_PATH TRUE SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH ${LIB_INSTALL_DIR} ) endif(NOT WIN32) @@ -116,7 +114,6 @@ if(QT_QTDESIGNER_FOUND) INSTALL_RPATH_USE_LINK_PATH TRUE SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH ${LIB_INSTALL_DIR} ) endif(NOT WIN32) @@ -152,7 +149,6 @@ if(QT_QTDESIGNER_FOUND) INSTALL_RPATH_USE_LINK_PATH TRUE SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE - INSTALL_RPATH ${LIB_INSTALL_DIR} ) endif(NOT WIN32)