filelight: build the radial map sources as part of filelightpart target

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/filelight/src/part/CMakeLists.txt b/filelight/src/part/CMakeLists.txt
index 577d250..070cbfe 100644 (file)
--- a/filelight/src/part/CMakeLists.txt
+++ b/filelight/src/part/CMakeLists.txt
@@ -18,9 +18,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #######################################################################
 
-add_subdirectory(radialMap)
-
 set(filelight_PART_SRCS
+    radialMap/widget.cpp
+    radialMap/builder.cpp
+    radialMap/map.cpp
+    radialMap/widgetEvents.cpp
+    radialMap/labels.cpp
     part.cpp
     scan.cpp
     progressBox.cpp
@@ -35,7 +38,7 @@ set(filelight_PART_SRCS
 
 kde4_add_plugin(filelightpart ${filelight_PART_SRCS})
 
-target_link_libraries(filelightpart radialmap
+target_link_libraries(filelightpart
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KPARTS_LIBS}
     ${KDE4_KDEUI_LIBS}
@@ -44,4 +47,7 @@ target_link_libraries(filelightpart radialmap
     ${KDE4_SOLID_LIBS}
 )
 
-install(TARGETS filelightpart DESTINATION ${KDE4_PLUGIN_INSTALL_DIR})
+install(
+    TARGETS filelightpart
+    DESTINATION ${KDE4_PLUGIN_INSTALL_DIR}
+)

diff --git a/filelight/src/part/radialMap/CMakeLists.txt b/filelight/src/part/radialMap/CMakeLists.txt
deleted file mode 100644 (file)
index 3ac719c..0000000
--- a/filelight/src/part/radialMap/CMakeLists.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-#######################################################################
-# Copyright 2008-2009  Martin Sandsmark <martin.sandsmark@kde.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License or (at your option) version 3 or any later version
-# accepted by the membership of KDE e.V. (or its successor approved
-# by the membership of KDE e.V.), which shall act as a proxy
-# defined in Section 14 of version 3 of the license.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#######################################################################
-
-set(radialmap_STAT_SRCS
-    widget.cpp
-    builder.cpp
-    map.cpp
-    widgetEvents.cpp
-    labels.cpp)
-
-add_library(radialmap ${radialmap_STAT_SRCS} )
-
-set_target_properties(radialmap PROPERTIES COMPILE_FLAGS -fPIC)
-