diff options
| author | Alex Merry <alex.merry@kde.org> | 2014-08-03 17:30:32 +0100 |
|---|---|---|
| committer | Alex Merry <alex.merry@kde.org> | 2014-08-06 21:21:44 +0100 |
| commit | 5b43e2def89b278d84344e0adf8d91b235d0f89a (patch) | |
| tree | 95099987dd25ce2f700fadd119f17cf4d981bee7 | |
| parent | c11e4a6a700ba064a2bce85037bfd981501991f4 (diff) | |
| download | extra-cmake-modules-5b43e2def89b278d84344e0adf8d91b235d0f89a.tar.gz extra-cmake-modules-5b43e2def89b278d84344e0adf8d91b235d0f89a.tar.bz2 | |
Remove Qt5 debugfull hack from ECMConfig.cmake
The original purpose of this was to set the QT_NO_DEBUG macro if the old
DebugFull configuration was used. We got rid of DebugFull (instead just
using Debug), so it is no longer relevant, and this hack never belonged
in ECMConfig.cmake anyway (it should have been in KDECompilerSettings).
CHANGELOG: ECM now works when the required CMake version is set to
3.0.0 or higher, and does not require Qt5Core to be available.
BUG: 331849
REVIEW: 119588
| -rw-r--r-- | ECMConfig.cmake.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/ECMConfig.cmake.in b/ECMConfig.cmake.in index ea47abf0..b163e3ae 100644 --- a/ECMConfig.cmake.in +++ b/ECMConfig.cmake.in @@ -16,10 +16,3 @@ set(ECM_KDE_MODULE_DIR "@PACKAGE_KDE_MODULES_INSTALL_DIR@") set(ECM_MODULE_PATH "${ECM_MODULE_DIR}" "${ECM_FIND_MODULE_DIR}" "${ECM_KDE_MODULE_DIR}") include("${ECM_MODULE_DIR}/ECMUseFindModules.cmake") - -if(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 2.8.13) - find_package(Qt5Core 5.2.0 REQUIRED) - set_property(TARGET Qt5::Core PROPERTY INTERFACE_COMPILE_DEFINITIONS QT_CORE_LIB $<$<NOT:$<OR:$<CONFIG:Debug>,$<CONFIG:DebugFull>>>:QT_NO_DEBUG>) -else() - message(FATAL_ERROR \"Remove this hack. Set CMAKE_MAP_IMPORTED_TARGET_DEBUGFULL to DEBUG instead.\") -endif() |