From ddbe8d46d236e0acc508c4a8e5c6cb7131f13b77 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Sat, 31 Oct 2015 13:36:29 +0200
Subject: [PATCH] generic: build system cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 CMakeLists.txt                                               | 4 +---
 kcontrol/touchpad/CMakeLists.txt                             | 6 ------
 kimgio/CMakeLists.txt                                        | 3 ---
 kioslave/mtp/CMakeLists.txt                                  | 2 --
 plasma/desktop/applets/homerun/CMakeLists.txt                | 3 ---
 plasma/generic/declarativeimports/draganddrop/CMakeLists.txt | 5 -----
 plasma/generic/declarativeimports/locale/CMakeLists.txt      | 5 -----
 7 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc514076..49219d46 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,5 @@
-project(KDEBASE_WORKSPACE)
+project(kde-workspace)
 
-include(CTest)
-include(CTestConfig.cmake)
 include(CheckIncludeFiles)
 include(CheckFunctionExists)
 
diff --git a/kcontrol/touchpad/CMakeLists.txt b/kcontrol/touchpad/CMakeLists.txt
index f89a3df3..7d61ba7b 100644
--- a/kcontrol/touchpad/CMakeLists.txt
+++ b/kcontrol/touchpad/CMakeLists.txt
@@ -2,11 +2,5 @@ project(kcm-touchpad)
 
 set(TOUCHPAD_KCM_VERSION "1.1")
 
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-
-include(KDE4Defaults)
-include_directories(${KDE4_INCLUDES})
-
 add_subdirectory(src)
 add_subdirectory(icon)
diff --git a/kimgio/CMakeLists.txt b/kimgio/CMakeLists.txt
index 62ee1173..be641ab9 100644
--- a/kimgio/CMakeLists.txt
+++ b/kimgio/CMakeLists.txt
@@ -1,8 +1,5 @@
 project(runtime_kimgio)
 
-find_package(KDE4 REQUIRED)
-include(KDE4Defaults)
-
 ##################################
 # WebP image IO support
 
diff --git a/kioslave/mtp/CMakeLists.txt b/kioslave/mtp/CMakeLists.txt
index 243728f4..2419edca 100644
--- a/kioslave/mtp/CMakeLists.txt
+++ b/kioslave/mtp/CMakeLists.txt
@@ -1,5 +1,3 @@
-include(KDE4Defaults)
-
 #add_definitions(-DKDE_DEFAULT_DEBUG_AREA=7999)
 add_definitions(-DQT_NO_CAST_FROM_ASCII)
 
diff --git a/plasma/desktop/applets/homerun/CMakeLists.txt b/plasma/desktop/applets/homerun/CMakeLists.txt
index 8d0cc1a5..987b8458 100644
--- a/plasma/desktop/applets/homerun/CMakeLists.txt
+++ b/plasma/desktop/applets/homerun/CMakeLists.txt
@@ -3,9 +3,6 @@ project(homerun)
 # Packaging
 set(HOMERUN_VERSION "1.2.5")
 
-# Dependencies
-find_package(KDE4 4.10.0 REQUIRED)
-include(KDE4Defaults)
 find_package(LibKonq REQUIRED)
 set_package_properties(LibKonq PROPERTIES
     DESCRIPTION "Standard file management features"
diff --git a/plasma/generic/declarativeimports/draganddrop/CMakeLists.txt b/plasma/generic/declarativeimports/draganddrop/CMakeLists.txt
index f133a916..965e1bdf 100644
--- a/plasma/generic/declarativeimports/draganddrop/CMakeLists.txt
+++ b/plasma/generic/declarativeimports/draganddrop/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(draganddrop)
 
-include(KDE4Defaults)
-
 set(declarativedragdrop_SRCS
     draganddropplugin.cpp
     DeclarativeDragArea.cpp
@@ -16,9 +14,6 @@ INCLUDE_DIRECTORIES(
         ${KDE4_INCLUDES}
 )
 
-qt4_automoc(${declarativedragdrop_SRCS})
-
-
 add_library(draganddropplugin SHARED ${declarativedragdrop_SRCS})
 target_link_libraries(draganddropplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY})
 
diff --git a/plasma/generic/declarativeimports/locale/CMakeLists.txt b/plasma/generic/declarativeimports/locale/CMakeLists.txt
index 9a24d0f9..d23f0701 100644
--- a/plasma/generic/declarativeimports/locale/CMakeLists.txt
+++ b/plasma/generic/declarativeimports/locale/CMakeLists.txt
@@ -1,7 +1,5 @@
 project(localebindings)
 
-include(KDE4Defaults)
-
 set(localebindings_SRCS
     locale.cpp
     localebindingsplugin.cpp
@@ -14,9 +12,6 @@ INCLUDE_DIRECTORIES(
         ${KDE4_INCLUDES}
 )
 
-qt4_automoc(${localebindings_SRCS})
-
-
 add_library(localebindingsplugin SHARED ${localebindings_SRCS})
 
 target_link_libraries(localebindingsplugin ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDECORE_LIBRARY})
-- 
2.11.0