diff options
| -rw-r--r-- | kde-modules/KDEInstallDirs5.cmake | 4 | ||||
| -rw-r--r-- | kde-modules/KDEInstallDirs6.cmake | 4 | ||||
| -rw-r--r-- | kde-modules/KDEInstallDirsCommon.cmake | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/kde-modules/KDEInstallDirs5.cmake b/kde-modules/KDEInstallDirs5.cmake index 21039420..92fdc149 100644 --- a/kde-modules/KDEInstallDirs5.cmake +++ b/kde-modules/KDEInstallDirs5.cmake @@ -291,6 +291,10 @@ else() QML_INSTALL_DIR) endif() +_define_relative(PLUGINDIR QTPLUGINDIR "" + "Plugins" + PLUGIN_INSTALL_DIR) + _define_non_cache(INCLUDEDIR_KF5 "${CMAKE_INSTALL_INCLUDEDIR}/KF5") if(NOT KDE_INSTALL_DIRS_NO_DEPRECATED) set(KF5_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR_KF5}") diff --git a/kde-modules/KDEInstallDirs6.cmake b/kde-modules/KDEInstallDirs6.cmake index e0e03c10..8f784857 100644 --- a/kde-modules/KDEInstallDirs6.cmake +++ b/kde-modules/KDEInstallDirs6.cmake @@ -273,6 +273,10 @@ option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, QCH files for Qt-ba QML_INSTALL_DIR) #endif() +_define_relative(PLUGINDIR QTPLUGINDIR "" + "Plugins" + PLUGIN_INSTALL_DIR) + _define_non_cache(INCLUDEDIR_KF6 "${CMAKE_INSTALL_INCLUDEDIR}/KF6") _define_non_cache(DATADIR_KF5 "${CMAKE_INSTALL_DATADIR}/kf6") diff --git a/kde-modules/KDEInstallDirsCommon.cmake b/kde-modules/KDEInstallDirsCommon.cmake index a492a14d..98d643f4 100644 --- a/kde-modules/KDEInstallDirsCommon.cmake +++ b/kde-modules/KDEInstallDirsCommon.cmake @@ -239,10 +239,6 @@ _define_relative(CMAKEPACKAGEDIR LIBDIR "cmake" "CMake packages, including config files" CMAKECONFIG_INSTALL_PREFIX) -_define_relative(PLUGINDIR QTPLUGINDIR "" - "Plugins" - PLUGIN_INSTALL_DIR) - _define_absolute(INCLUDEDIR "include" "C and C++ header files" INCLUDE_INSTALL_DIR) |