diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-04-26 11:30:53 +0100 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-04-26 11:40:16 +0100 |
| commit | 78cd06d25146dc2c3d9239206000d59c2eebd864 (patch) | |
| tree | 795a5a2abcf720d8a7d5dcd5d2ac0ffaea6bdf28 | |
| parent | b8eef54f37f3e206d116acf5e0ab31248bd9d40b (diff) | |
| download | extra-cmake-modules-78cd06d25146dc2c3d9239206000d59c2eebd864.tar.gz extra-cmake-modules-78cd06d25146dc2c3d9239206000d59c2eebd864.tar.bz2 | |
Add KF5_INCLUDE_INSTALL_DIR variable to KDEInstallDirs
Currently, this is the same as INCLUDE_INSTALL_DIR, but
INCLUDE_INSTALL_DIR will lose the "KF5" suffix once the frameworks are
changed to use KF5_INCLUDE_INSTALL_DIR. Because INCLUDE_INSTALL_DIR is
used in INSTALL_TARGETS_DEFAULT_ARGS, there is now also a
KF5_INSTALL_TARGETS_DEFAULT_ARGS.
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 2303c6bf..67741090 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -199,6 +199,8 @@ else() _set_fancy(LIBEXEC_INSTALL_DIR "${LIB_INSTALL_DIR}/kde5/libexec" "The install dir for libexec executables (default is ${LIB_INSTALL_DIR}/kde5/libexec)") endif() _set_fancy(INCLUDE_INSTALL_DIR "include/KF5" "The install dir for header files") +# this exists as a convenience for frameworks +set(KF5_INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}") _set_fancy(QT_PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/plugins" "The install dir where Qt plugins will be installed (default is ${LIB_INSTALL_DIR}/plugins)") _set_fancy(PLUGIN_INSTALL_DIR "${QT_PLUGIN_INSTALL_DIR}/kf5" "The install dir where plugins (loaded via KPluginLoader) will be installed (default is ${LIB_INSTALL_DIR}/plugins/kf5)") @@ -247,6 +249,11 @@ set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}" ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel INCLUDES DESTINATION "${INCLUDE_INSTALL_DIR}" ) +set(KF5_INSTALL_TARGETS_DEFAULT_ARGS RUNTIME DESTINATION "${BIN_INSTALL_DIR}" + LIBRARY DESTINATION "${LIB_INSTALL_DIR}" + ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel + INCLUDES DESTINATION "${KF5_INCLUDE_INSTALL_DIR}" +) # on the Mac support an extra install directory for application bundles |