diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-04-26 12:27:52 +0100 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-04-26 12:27:52 +0100 |
| commit | 84b937141b7111fb0cd7ac9f58c0d535f2e79f0a (patch) | |
| tree | c2aef43a06d2250d24b9d8d911ca7b106b852194 | |
| parent | 78cd06d25146dc2c3d9239206000d59c2eebd864 (diff) | |
| download | extra-cmake-modules-84b937141b7111fb0cd7ac9f58c0d535f2e79f0a.tar.gz extra-cmake-modules-84b937141b7111fb0cd7ac9f58c0d535f2e79f0a.tar.bz2 | |
Remove KF5 suffix from INCLUDE_INSTALL_DIR default value
Only frameworks should be installing in include/KF5. They use
KF5_INCLUDE_INSTALL_DIR, which has the KF5 suffix, while other code
should install to just include (or a subdirectory of their choice).
| -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 67741090..d1a3336d 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -198,9 +198,9 @@ if(WIN32) 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") +_set_fancy(INCLUDE_INSTALL_DIR "include" "The install dir for header files") # this exists as a convenience for frameworks -set(KF5_INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}") +set(KF5_INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}/KF5") _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)") |