From 4adb865a25d37146373c93b621cbce6c09b0c6e8 Mon Sep 17 00:00:00 2001
From: James Hogan <james@albanarts.com>
Date: Sun, 21 Sep 2008 11:58:16 +0100
Subject: [PATCH] Tidy CMakeLists.txt files

---
 kworship/css/CMakeLists.txt      | 5 -----
 kworship/display/CMakeLists.txt  | 9 ++-------
 kworship/media/CMakeLists.txt    | 7 +------
 kworship/playlist/CMakeLists.txt | 5 -----
 kworship/songdb/CMakeLists.txt   | 5 -----
 5 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/kworship/css/CMakeLists.txt b/kworship/css/CMakeLists.txt
index 81e1e58..2c5d7dd 100644
--- a/kworship/css/CMakeLists.txt
+++ b/kworship/css/CMakeLists.txt
@@ -3,8 +3,6 @@ project(kworshipcss)
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 
-set(kworshipcss_MOC_SRCS
-)
 set(kworshipcss_SRCS
     KwCssAbstractStyle.cpp
     KwCssAbstractStyleState.cpp
@@ -15,10 +13,7 @@ set(kworshipcss_SRCS
     KwCssStyleRule.cpp
     KwCssStyleSheet.cpp
     KwCssStyleSheetFile.cpp
-    ${kworshipcss_MOC_SRCS}
 )
 
-kde4_add_ui_files(kworshipcss_MOC_SRCS)
-
 kde4_add_library(kworshipcss ${kworshipcss_SRCS})
 
diff --git a/kworship/display/CMakeLists.txt b/kworship/display/CMakeLists.txt
index 26a0c0d..d28cad1 100644
--- a/kworship/display/CMakeLists.txt
+++ b/kworship/display/CMakeLists.txt
@@ -3,14 +3,12 @@ project(kworshipdisplay)
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 
-set(kworshipdisplay_MOC_SRCS
-    KwLocalDisplay.cpp
-    KwLocalDisplayPreview.cpp
-)
 set(kworshipdisplay_SRCS
     KwAbstractDisplay.cpp
     KwLocalDisplayController.cpp
     KwRemoteDisplayController.cpp
+    KwLocalDisplay.cpp
+    KwLocalDisplayPreview.cpp
     KwRemoteDisplay.cpp
     KwLoggingDisplay.cpp
     KwDisplayMixer.cpp
@@ -24,10 +22,7 @@ set(kworshipdisplay_SRCS
     KwBackgroundManager.cpp
     KwTextManager.cpp
     KwOverlayManager.cpp
-    ${kworshipdisplay_MOC_SRCS}
 )
 
-kde4_add_ui_files(kworshipdisplay_MOC_SRCS)
-
 kde4_add_library(kworshipdisplay ${kworshipdisplay_SRCS})
 
diff --git a/kworship/media/CMakeLists.txt b/kworship/media/CMakeLists.txt
index 8b7e05a..013d76b 100644
--- a/kworship/media/CMakeLists.txt
+++ b/kworship/media/CMakeLists.txt
@@ -3,7 +3,7 @@ project(kworshipmedia)
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 
-set(kworshipmedia_MOC_SRCS
+set(kworshipmedia_SRCS
     KwMediaManager.cpp
     KwMediaPreferencesSequence.cpp
     KwMediaPreferencesAudio.cpp
@@ -11,15 +11,10 @@ set(kworshipmedia_MOC_SRCS
     KwMediaControlWidgetAudio.cpp
     KwMediaControlWidgetSequence.cpp
     KwMediaControlWidgetVisual.cpp
-)
-set(kworshipmedia_SRCS
     KwAbstractMediaPreferences.cpp
     KwMediaPreferencesVisual.cpp
     KwMediaItem.cpp
-    ${kworshipmedia_MOC_SRCS}
 )
 
-kde4_add_ui_files(kworshipmedia_MOC_SRCS)
-
 kde4_add_library(kworshipmedia ${kworshipmedia_SRCS})
 
diff --git a/kworship/playlist/CMakeLists.txt b/kworship/playlist/CMakeLists.txt
index fb5e335..20cc640 100644
--- a/kworship/playlist/CMakeLists.txt
+++ b/kworship/playlist/CMakeLists.txt
@@ -3,8 +3,6 @@ project(kworshipplaylist)
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 
-set(kworshipplaylist_MOC_SRCS
-)
 set(kworshipplaylist_SRCS
     KwPlaylistNode.cpp
     KwPlaylistModel.cpp
@@ -28,10 +26,7 @@ set(kworshipplaylist_SRCS
     KwPlaylistSongNodeVerse.cpp
     KwPlaylistText.cpp
     KwPlaylistTextNode.cpp
-    ${kworshipplaylist_MOC_SRCS}
 )
 
-kde4_add_ui_files(kworshipplaylist_MOC_SRCS)
-
 kde4_add_library(kworshipplaylist ${kworshipplaylist_SRCS})
 
diff --git a/kworship/songdb/CMakeLists.txt b/kworship/songdb/CMakeLists.txt
index 6fb7c2c..59eb309 100644
--- a/kworship/songdb/CMakeLists.txt
+++ b/kworship/songdb/CMakeLists.txt
@@ -3,8 +3,6 @@ project(kworshipsongdb)
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 
-set(kworshipsongdb_MOC_SRCS
-)
 set(kworshipsongdb_SRCS
     KwSongdb.cpp
     KwSongdbSong.cpp
@@ -17,10 +15,7 @@ set(kworshipsongdb_SRCS
     KwSongdbNode.cpp
     KwSongdbFilterNode.cpp
     KwSongdbVersionNode.cpp
-    ${kworshipsongdb_MOC_SRCS}
 )
 
-kde4_add_ui_files(kworshipsongdb_MOC_SRCS)
-
 kde4_add_library(kworshipsongdb ${kworshipsongdb_SRCS})
 
-- 
2.11.4.GIT