From f0607b48cdced1982266d64fd97dd9c1399f96c7 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Sun, 27 Apr 2014 14:07:20 +0100 Subject: Do not use a "kf5" subdirectory for PLUGIN_INSTALL_DIR This is where applications install plugins, so "kf5" is incorrect. Software should use application- or framework-specific directories (which may or may not be versioned). --- kde-modules/KDEInstallDirs.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kde-modules') diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 993cd7ad..d22f7177 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -204,7 +204,7 @@ _set_fancy(INCLUDE_INSTALL_DIR "include" 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)") +_set_fancy(PLUGIN_INSTALL_DIR "${QT_PLUGIN_INSTALL_DIR}" "The install dir where framework and application plugins will be installed (default is ${QT_PLUGIN_INSTALL_DIR})") _set_fancy(IMPORTS_INSTALL_DIR "${QT_PLUGIN_INSTALL_DIR}/imports" "The install dir where QtQuick1 imports will be installed") _set_fancy(QML_INSTALL_DIR "${LIB_INSTALL_DIR}/qml" "The install dir where QtQuick2 imports will be installed") _set_fancy(CMAKECONFIG_INSTALL_PREFIX "${LIB_INSTALL_DIR}/cmake" "The prefix under which packages will create their own subdirectory for their CMake configuration files") -- cgit v1.2.1