From f8609e8b64fd9170aa1444ad4e2f6d6d759e9050 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Thu, 11 Sep 2014 21:00:00 +0100 Subject: Fix fallout from recent ECM patches KDE modules cannot assume the normal ECM modules are in the CMake module path, and CMAKE_INSTALL_IMPORTS_INSTALL_DIR / QTQUICKIMPORTSDIR was not set correctly. Also, ECMQueryQmake.cmake used a deprecated CMake command (exec_program). --- kde-modules/KDEInstallDirs.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kde-modules/KDEInstallDirs.cmake') diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake index 54eb49cc..7fbf6728 100644 --- a/kde-modules/KDEInstallDirs.cmake +++ b/kde-modules/KDEInstallDirs.cmake @@ -324,7 +324,7 @@ _define_relative(CMAKEPACKAGEDIR LIBDIR "cmake" option (KDE_INSTALL_USE_QT_SYS_PATHS "Install mkspecs files, Plugins and Imports to the Qt 5 install dir") if(KDE_INSTALL_USE_QT_SYS_PATHS) # Qt-specific vars - include(ECMQueryQmake) + include("${ECM_MODULE_DIR}/ECMQueryQmake.cmake") query_qmake(qt_plugins_dir QT_INSTALL_PLUGINS) @@ -334,7 +334,7 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS) query_qmake(qt_imports_dir QT_INSTALL_IMPORTS) - _define_absolute(QTQUICKIMPORTSDIR QTPLUGINDIR ${qt_imports_dir} + _define_absolute(QTQUICKIMPORTSDIR ${qt_imports_dir} "QtQuick1 imports" IMPORTS_INSTALL_DIR) -- cgit v1.2.1