diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-02-18 16:43:37 +0100 |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2012-02-18 16:43:37 +0100 |
| commit | 97757b56d09b77b8fdd25ce785f44fcbde18617c (patch) | |
| tree | 3b5acaa9a88b54fe734fab3d9b06f69d8e3071b4 /kde-modules/KDECMakeSettings.cmake | |
| parent | 54995246620b13793722977aeeb72821519e65e5 (diff) | |
| download | extra-cmake-modules-97757b56d09b77b8fdd25ce785f44fcbde18617c.tar.gz extra-cmake-modules-97757b56d09b77b8fdd25ce785f44fcbde18617c.tar.bz2 | |
-add fix from Rex Dieter to not add directories from CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES to the RPATH
Alex
Diffstat (limited to 'kde-modules/KDECMakeSettings.cmake')
| -rw-r--r-- | kde-modules/KDECMakeSettings.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake index fb9d9c6e..828a0b38 100644 --- a/kde-modules/KDECMakeSettings.cmake +++ b/kde-modules/KDECMakeSettings.cmake @@ -26,7 +26,9 @@ if(NOT KDE_SKIP_RPATH_SETTINGS) # directories listed in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) and use the RPATH figured out by cmake when compiling list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir) - if("${_isSystemLibDir}" STREQUAL "-1") + list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCxxLibDir) + list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemCLibDir) + if("${_isSystemPlatformLibDir}" STREQUAL "-1" AND "${_isSystemCxxLibDir}" STREQUAL "-1" AND "${_isSystemCLibDir}" STREQUAL "-1") set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}") endif() |