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/KDECompilerSettings.cmake | |
| 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/KDECompilerSettings.cmake')
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 4 |
1 files changed, 2 insertions, 2 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") |