diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-09-11 21:00:00 +0100 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-09-11 21:00:00 +0100 |
| commit | f8609e8b64fd9170aa1444ad4e2f6d6d759e9050 (patch) | |
| tree | 083c6d46b2d494bd6f8161e523d9dff82dadbc4a /kde-modules | |
| parent | 6ab50fa9e27c4710beb2641fd510dfce08cc2719 (diff) | |
| download | extra-cmake-modules-f8609e8b64fd9170aa1444ad4e2f6d6d759e9050.tar.gz extra-cmake-modules-f8609e8b64fd9170aa1444ad4e2f6d6d759e9050.tar.bz2 | |
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).
Diffstat (limited to 'kde-modules')
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 4 | ||||
| -rw-r--r-- | kde-modules/KDEInstallDirs.cmake | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index fbb464d1..8b31b160 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -420,6 +420,6 @@ if (MINGW AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols") endif() -include(ECMEnableSanitizers) -include(ECMCoverageOption) +include("${ECM_MODULE_DIR}/ECMEnableSanitizers.cmake") +include("${ECM_MODULE_DIR}/ECMCoverageOption.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) |