diff options
| author | Harald Sitter <sitter@kde.org> | 2014-09-16 11:15:01 +0200 |
|---|---|---|
| committer | Harald Sitter <sitter@kde.org> | 2014-09-16 11:15:01 +0200 |
| commit | 12d477256d805a5a09b237e15033a5f591d5f0d0 (patch) | |
| tree | 122195111a89b11d14219c5d9a9d355cbc2aba61 | |
| parent | eba5ba97800e3b1623694a5ea99cb5e65f1ec0a9 (diff) | |
| download | extra-cmake-modules-12d477256d805a5a09b237e15033a5f591d5f0d0.tar.gz extra-cmake-modules-12d477256d805a5a09b237e15033a5f591d5f0d0.tar.bz2 | |
allow qmldir to follow qt_sys_path
when running with the KDE_INSTALL_USE_QT_SYS_PATHS option allow QMLDIR in
KDEInstallDirs to follow whatever is defined by qmake
this change makes sure that qml plugins will end up in a default Qt path
when using the super special magic flag.
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 13 | ||||
| -rw-r--r-- | tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 7fbf6728..e255e87e 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -338,6 +338,11 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) "QtQuick1 imports" IMPORTS_INSTALL_DIR) + query_qmake(qt_qml_dir QT_INSTALL_QML) + + _define_absolute(QMLDIR ${qt_qml_dir} + "QtQuick2 imports" + QML_INSTALL_DIR) else() _define_relative(QTPLUGINDIR LIBDIR "plugins" "Qt plugins" @@ -346,16 +351,16 @@ else() _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports" "QtQuick1 imports" IMPORTS_INSTALL_DIR) + + _define_relative(QMLDIR LIBDIR "qml" + "QtQuick2 imports" + QML_INSTALL_DIR) endif() _define_relative(PLUGINDIR QTPLUGINDIR "" "Plugins" PLUGIN_INSTALL_DIR) -_define_relative(QMLDIR LIBDIR "qml" - "QtQuick2 imports" - QML_INSTALL_DIR) - _define_absolute(INCLUDEDIR "include" "C and C++ header files" INCLUDE_INSTALL_DIR) diff --git a/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt b/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt index 40c1cd88..910a0ede 100644 --- a/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt +++ b/tests/KDEInstallDirsTest/qt_vars_defined/CMakeLists.txt @@ -37,7 +37,6 @@ set(relative_path_vars LIB_INSTALL_DIR LOCALE_INSTALL_DIR MAN_INSTALL_DIR - QML_INSTALL_DIR SBIN_INSTALL_DIR SERVICES_INSTALL_DIR SERVICETYPES_INSTALL_DIR @@ -84,7 +83,6 @@ set(relative_path_vars CMAKE_INSTALL_MANDIR CMAKE_INSTALL_MIMEDIR CMAKE_INSTALL_METAINFODIR - CMAKE_INSTALL_QMLDIR CMAKE_INSTALL_SBINDIR CMAKE_INSTALL_SHAREDSTATEDIR CMAKE_INSTALL_SOUNDDIR @@ -96,9 +94,11 @@ set(relative_path_vars set(absolute_path_vars IMPORTS_INSTALL_DIR PLUGIN_INSTALL_DIR + QML_INSTALL_DIR QT_PLUGIN_INSTALL_DIR CMAKE_INSTALL_PLUGINDIR + CMAKE_INSTALL_QMLDIR CMAKE_INSTALL_QTPLUGINDIR CMAKE_INSTALL_QTQUICKIMPORTSDIR |