diff options
| author | Sebastian Kügler <sebas@kde.org> | 2013-02-12 12:41:45 +0100 |
|---|---|---|
| committer | Sebastian Kügler <sebas@kde.org> | 2013-02-12 12:41:45 +0100 |
| commit | 1923f89331d68e3669ce1d81b8697e3b1f84bff5 (patch) | |
| tree | 1c595dfe07be41975f1d81f5e659394f88172d39 | |
| parent | 93457e172cf17a442938614cca1862a2dcfd889f (diff) | |
| download | extra-cmake-modules-1923f89331d68e3669ce1d81b8697e3b1f84bff5.tar.gz extra-cmake-modules-1923f89331d68e3669ce1d81b8697e3b1f84bff5.tar.bz2 | |
QML_INSTALL_DIR points to LIB_INSTALL_DIR/qml
This patch adds a variable QML_INSTALL_DIR, pointing to the location to
install QtQuick2 imports. These are co-installable with QtQuick 1.x, so
we need both dirs. Naming is consistent with the path, so IMPORT is
ditched from the name (the path doesn't have imports in it anymore).
REVIEW:1088889
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index ea132e6e..1c033c4e 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -19,6 +19,7 @@ # QT_PLUGIN_INSTALL_DIR - the directory where Qt plugins will be installed (default is {LIB_INSTALL_DIR}/plugins) # PLUGIN_INSTALL_DIR - the directory where KDE plugins will be installed (default is ${QT_PLUGIN_INSTALL_DIR}/kf5) # IMPORTS_INSTALL_DIR - the directory where QML imports will be installed (default is ${QT_PLUGIN_INSTALL_DIR}/imports) +# QML_INSTALL_DIR - the directory where QML2 imports will be installed (default is ${LIB_INSTALL_DIR}/qml) # SERVICES_INSTALL_DIR - the directory where service (desktop, protocol, ...) files will be installed # SERVICETYPES_INSTALL_DIR - the directory where servicestypes desktop files will be installed # SOUND_INSTALL_DIR - the directory where sound files will be installed @@ -131,7 +132,8 @@ _set_fancy(INCLUDE_INSTALL_DIR "include" _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(IMPORTS_INSTALL_DIR "${QT_PLUGIN_INSTALL_DIR}/imports" "The install dir where imports will be installed") +_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") _set_fancy(DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}" "The parent directory where applications can install their data") _set_fancy(HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/HTML" "The HTML install dir for documentation") |