diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-11-27 23:11:49 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-11-27 23:11:49 +0000 |
| commit | 93896ee1abdb312b7cb9826b9af0c9f617572a62 (patch) | |
| tree | 5eacf02dfbc89fdee9945153c4fbb80ede832602 | |
| parent | b720757027cc164e6f3cf137d4dae1a3c8575c4f (diff) | |
| download | extra-cmake-modules-93896ee1abdb312b7cb9826b9af0c9f617572a62.tar.gz extra-cmake-modules-93896ee1abdb312b7cb9826b9af0c9f617572a62.tar.bz2 | |
-modify RPATH behaviour for libraries so that they work as expected (...although it might not be correct expectations...)
this changed with cmake 2.4.3, where INSTALL_RPATH_USE_LINK_PATH was introduced
-add docs for BIN_INSTALL_DIR and SBIN_INSTALL_DIR
Alex
svn path=/trunk/KDE/kdelibs/; revision=608580
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 4 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index d8ad5e0b..bf327f0f 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -73,13 +73,15 @@ # for install directories. They are all interpreted relative # to CMAKE_INSTALL_PREFIX # +# BIN_INSTALL_DIR - the directory where executables be installed (default is prefix/bin) +# SBIN_INSTALL_DIR - the directory where system executables will be installed (default is prefix/sbin) +# LIB_INSTALL_DIR - the directory where libraries will be installed (default is prefix/lib) # CONFIG_INSTALL_DIR - the config file install dir # DATA_INSTALL_DIR - the parent directory where applications can install their data # HTML_INSTALL_DIR - the HTML install dir for documentation # ICON_INSTALL_DIR - the icon install dir (default prefix/share/icons/) # INFO_INSTALL_DIR - the kde info install dir (default prefix/info) # KCFG_INSTALL_DIR - the install dir for kconfig files -# LIB_INSTALL_DIR - the subdirectory relative to the install prefix where libraries will be installed (default is /lib) # LOCALE_INSTALL_DIR - the install dir for translations # MAN_INSTALL_DIR - the kde man page install dir (default prefix/man/) # MIME_INSTALL_DIR - the install dir for the mimetype desktop files diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 688393bc..1e3f75cf 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -410,7 +410,7 @@ endmacro (KDE4_CREATE_FINAL_FILES) # the hope that the RPATH which is compiled into the executable is good enough. macro (KDE4_HANDLE_RPATH_FOR_LIBRARY _target_NAME) if (NOT CMAKE_SKIP_RPATH) - set_target_properties(${_target_NAME} PROPERTIES SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH "") + set_target_properties(${_target_NAME} PROPERTIES INSTALL_RPATH_USE_LINK_PATH FALSE SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE INSTALL_RPATH "") endif (NOT CMAKE_SKIP_RPATH) endmacro (KDE4_HANDLE_RPATH_FOR_LIBRARY) |