diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-05-08 10:38:40 +0100 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-05-08 12:03:19 +0100 |
| commit | 4f0bccb63bfc97f7cbd510db9aef7f1486a2633e (patch) | |
| tree | 9de5fd73306ff08cfc665b5d1cca87cee7015a2e | |
| parent | e5b9c70672f5bb608a35204fab0370d2bef4fa34 (diff) | |
| download | extra-cmake-modules-4f0bccb63bfc97f7cbd510db9aef7f1486a2633e.tar.gz extra-cmake-modules-4f0bccb63bfc97f7cbd510db9aef7f1486a2633e.tar.bz2 | |
Make the KF5_LIBEXEC_INSTALL_DIR default depend on LIBEXEC_INSTALL_DIR
This way, overriding LIBEXEC_INSTALL_DIR will change where frameworks
install libexec files in the expected way.
REVIEW: 118048
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 9efa90f8..cadbba13 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -197,10 +197,10 @@ _set_fancy(SBIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}sbin" _set_fancy(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}${_LIBDIR_DEFAULT}" "The subdirectory relative to the install prefix where libraries will be installed (default is ${EXEC_INSTALL_PREFIX}/lib[64], Debian multiarch is taken into account)") if(WIN32) _set_fancy(LIBEXEC_INSTALL_DIR "${BIN_INSTALL_DIR}" "The install dir for libexec executables (default is ${BIN_INSTALL_DIR} on Windows)") - _set_fancy(KF5_LIBEXEC_INSTALL_DIR "${BIN_INSTALL_DIR}" "The install dir for KF5 libexec executables (default is ${BIN_INSTALL_DIR} on Windows)") + _set_fancy(KF5_LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}" "The install dir for KF5 libexec executables (default is ${LIBEXEC_INSTALL_DIR} on Windows)") else() _set_fancy(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/libexec" "The install dir for libexec executables (default is ${LIB_INSTALL_DIR}/libexec)") - _set_fancy(KF5_LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/libexec/kf5" "The install dir for KF5 libexec executables (default is ${LIB_INSTALL_DIR}/libexec/kf5)") + _set_fancy(KF5_LIBEXEC_INSTALL_DIR "${LIBEXEC_INSTALL_DIR}/kf5" "The install dir for KF5 libexec executables (default is ${LIBEXEC_INSTALL_DIR}/kf5)") endif() _set_fancy(INCLUDE_INSTALL_DIR "include" "The install dir for header files") # this exists as a convenience for frameworks |