From bb7b2f05ccc1094282a2440ef8708047ce9a5f3d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 14 Feb 2015 17:13:46 +0000 Subject: [PATCH] cmake: remove deprecated kde4automoc support --- cmake/modules/CMakeLists.txt | 1 - cmake/modules/FindKDE4Internal.cmake | 4 ---- cmake/modules/kde4automoc.files.in | 4 ---- 3 files changed, 9 deletions(-) delete mode 100644 cmake/modules/kde4automoc.files.in diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt index 4be14614..9368eb76 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt @@ -132,7 +132,6 @@ set(cmakeFiles cmake-modules-styleguide.txt kde4init_dummy.cpp.in kde4_cmake_uninstall.cmake.in - kde4automoc.files.in BasicFindPackageVersion.cmake.in FindLibPython.py FindPyKDE4.py diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake index 66685972..5b6c7ab1 100644 --- a/cmake/modules/FindKDE4Internal.cmake +++ b/cmake/modules/FindKDE4Internal.cmake @@ -38,7 +38,6 @@ # compile KDE software: # # KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable -# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead # KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable # # The following variables point to the location of the KDE libraries, @@ -397,9 +396,6 @@ endif (NOT AUTOMOC4_VERSION) set(_automoc4_min_version "0.9.88") macro_ensure_version("${_automoc4_min_version}" "${AUTOMOC4_VERSION}" _automoc4_version_ok) -# for compatibility with KDE 4.0.x -set(KDE4_AUTOMOC_EXECUTABLE "${AUTOMOC4_EXECUTABLE}" ) - # Perl is not required for building KDE software, but we had that here since 4.0 find_package(Perl) if(NOT PERL_FOUND) diff --git a/cmake/modules/kde4automoc.files.in b/cmake/modules/kde4automoc.files.in deleted file mode 100644 index 011c52a3..00000000 --- a/cmake/modules/kde4automoc.files.in +++ /dev/null @@ -1,4 +0,0 @@ -MOC_INCLUDES: -@_moc_incs@ -SOURCES: -@_moc_files@