[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/noatun
From:       Stefan Gehn <mETz81 () web ! de>
Date:       2007-01-21 16:32:53
Message-ID: 1169397173.022830.17968.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 625930 by metz:

Compile with cmake.
NOTE: akode-engine has been left out on purpose. Either we add an aKode check or we \
simply use Phonon (undecided so far)


 M  +33 -37    library/CMakeLists.txt  
 M  +20 -21    library/noatun/CMakeLists.txt  
 M  +4 -18     modules/CMakeLists.txt  
 A             modules/akode-engine/CMakeLists.txt  
 M  +11 -14    modules/noatunui/CMakeLists.txt  
 A             modules/noatunui/pics/CMakeLists.txt  
 M  +13 -20    modules/splitplaylist/CMakeLists.txt  


--- trunk/KDE/kdemultimedia/noatun/library/CMakeLists.txt #625929:625930
@@ -1,32 +1,32 @@
 
-add_subdirectory( noatuntags ) 
-add_subdirectory( noatun ) 
+add_subdirectory( noatuntags )
+add_subdirectory( noatun )
 
 include_directories( ${CMAKE_SOURCE_DIR}/noatun/library/noatun \
${CMAKE_SOURCE_DIR}/noatun/library )  
 
 ########### next target ###############
 
-set(noatun_LIB_SRCS 
-        cmodule.cpp 
-        controls.cpp 
-        downloader.cpp 
-        engine.cpp 
-        frontend.cpp 
-        global.cpp 
-        hardwarevc.cpp 
-        nmainwindow.cpp 
-        player.cpp 
-        playlist.cpp 
-        playlistitem.cpp 
-        playlistsaver.cpp 
-        plugin.cpp 
-        plugininterfaces.cpp 
-        pluginloader.cpp 
-        preferencesdialog.cpp 
-        scrollinglabel.cpp 
-        stdaction.cpp 
-	stereobuttonaction.cpp 
+set(noatun_LIB_SRCS
+        cmodule.cpp
+        controls.cpp
+        downloader.cpp
+        engine.cpp
+        frontend.cpp
+        global.cpp
+        hardwarevc.cpp
+        nmainwindow.cpp
+        player.cpp
+        playlist.cpp
+        playlistitem.cpp
+        playlistsaver.cpp
+        plugin.cpp
+        plugininterfaces.cpp
+        pluginloader.cpp
+        preferencesdialog.cpp
+        scrollinglabel.cpp
+        stdaction.cpp
+	stereobuttonaction.cpp
         config.cpp)
 
 set(header_file_to_automoc
@@ -75,33 +75,29 @@
 
 ########### next target ###############
 
-set(noatuncontrols_LIB_SRCS controls.cpp scrollinglabel.cpp )
+#set(noatuncontrols_LIB_SRCS controls.cpp scrollinglabel.cpp )
+#kde4_automoc(${noatuncontrols_LIB_SRCS})
+#kde4_add_library(noatuncontrols SHARED ${noatuncontrols_LIB_SRCS})
+#target_link_libraries(noatuncontrols  ${KDE4_KDEUI_LIBS} )
+#set_target_properties(noatuncontrols PROPERTIES VERSION 1.2.0 SOVERSION 1 )
+#install(TARGETS noatuncontrols  DESTINATION ${LIB_INSTALL_DIR} )
 
-kde4_automoc(${noatuncontrols_LIB_SRCS})
 
-kde4_add_library(noatuncontrols SHARED ${noatuncontrols_LIB_SRCS})
-
-target_link_libraries(noatuncontrols  ${KDE4_KDEUI_LIBS} )
-
-set_target_properties(noatuncontrols PROPERTIES VERSION 1.2.0 SOVERSION 1 )
-install(TARGETS noatuncontrols  DESTINATION ${LIB_INSTALL_DIR} )
-
-
 ########### next target ###############
 
 set(gentable_SRCS gentable.cpp )
-
 kde4_automoc(${gentable_SRCS})
-
 kde4_add_executable(gentable ${gentable_SRCS})
-
 target_link_libraries(gentable  ${KDE4_KDECORE_LIBS} )
 
 
 ########### install files ###############
 
-#install( FILES cmodule.h plugin_deps.h equalizerview.h effectview.h mimetypetree.h  \
                ksaver.h  DESTINATION ${INCLUDE_INSTALL_DIR} )
-
 install( FILES noatun_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/noatun/ )
 
+# XMLGUI
+install( FILES noatun.rc DESTINATION ${DATA_INSTALL_DIR}/noatun )
 
+# Plugin ServiceType
+install( FILES noatunplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+
--- trunk/KDE/kdemultimedia/noatun/library/noatun/CMakeLists.txt #625929:625930
@@ -1,25 +1,24 @@
-install( FILES 
-	cmodule.h 
+install( FILES
+	cmodule.h
 	config.h
-	controls.h 
-	downloader.h 
-	engine.h 
-	frontend.h 
-	global.h 
-	nmainwindow.h 
-	player.h 
-	playlist.h 
-	playlistitem.h 
-	playlistsaver.h 
-	plugin.h 
-	plugininterfaces.h 
-	pluginloader.h 
-	scrollinglabel.h 
-	stdaction.h 
-	stereobuttonaction.h 
-	version.h 
-	DESTINATION  ${DATA_INSTALL_DIR}/noatun )
+	controls.h
+	downloader.h
+	engine.h
+	frontend.h
+	global.h
+	nmainwindow.h
+	player.h
+	playlist.h
+	playlistitem.h
+	playlistsaver.h
+	plugin.h
+	plugininterfaces.h
+	pluginloader.h
+	scrollinglabel.h
+	stdaction.h
+	stereobuttonaction.h
+	version.h
+	DESTINATION  ${INCLUDE_INSTALL_DIR}/noatun )
 
 
 
-
--- trunk/KDE/kdemultimedia/noatun/modules/CMakeLists.txt #625929:625930
@@ -1,21 +1,7 @@
 
-#add_subdirectory( artseffects ) 
-#add_subdirectory( dcopiface ) 
-#add_subdirectory( excellent ) 
-#add_subdirectory( htmlexport ) 
-#add_subdirectory( infrared ) 
-#add_subdirectory( kaiman ) 
-#add_subdirectory( keyz ) 
-#add_subdirectory( kjofol-skin ) 
-#add_subdirectory( marquis ) 
-#add_subdirectory( metatag ) 
-#add_subdirectory( monoscope ) 
-#add_subdirectory( net ) 
-#add_subdirectory( noatunui ) 
-#add_subdirectory( splitplaylist ) 
-#add_subdirectory( systray ) 
-#add_subdirectory( voiceprint ) 
-#add_subdirectory( winskin ) 
-#add_subdirectory( simple ) 
+# FIXME: Add check for akode (or use avkode or phonon?)
+#add_subdirectory( akode-engine )
 
+add_subdirectory( noatunui )
 
+add_subdirectory( splitplaylist )
--- trunk/KDE/kdemultimedia/noatun/modules/noatunui/CMakeLists.txt #625929:625930
@@ -1,21 +1,18 @@
 
-set(noatun_ui_PART_SRCS noatunui.cpp userinterface.cpp )
+add_subdirectory( pics )
 
-kde4_automoc(${noatun_ui_PART_SRCS})
+set(noatun_ui_PART_SRCS
+	userinterface.cpp)
 
+kde4_automoc(${noatun_ui_PART_SRCS})
 kde4_add_plugin(noatun_ui ${noatun_ui_PART_SRCS})
 
+target_link_libraries(noatun_ui
+	${KDE4_KDECORE_LIBS}
+	noatun)
 
+# install plugin shared object
+install(TARGETS noatun_ui DESTINATION ${PLUGIN_INSTALL_DIR})
 
-target_link_libraries(noatun_ui  ${KDE4_KDECORE_LIBS} noatun noatuncontrols qtmcop \
                kmedia2_idl soundserver_idl )
-
-install(TARGETS noatun_ui  DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-
-########### install files ###############
-
-install( FILES noatunui.plugin  DESTINATION  ${DATA_INSTALL_DIR}/noatun )
-
-
-
-
+# Install services description
+install(FILES noatunui.desktop DESTINATION ${SERVICES_INSTALL_DIR}/noatun)
--- trunk/KDE/kdemultimedia/noatun/modules/splitplaylist/CMakeLists.txt \
#625929:625930 @@ -1,28 +1,21 @@
 
-########### next target ###############
+set(noatun_splitplaylist_PART_SRCS
+	playlist.cpp
+	view.cpp
+	find.cpp)
 
-set(noatun_splitplaylist_PART_SRCS 
-   splitplaylist.cpp 
-   playlist.cpp 
-   view.cpp 
-   find.cpp )
-
 kde4_automoc(${noatun_splitplaylist_PART_SRCS})
-
 kde4_add_plugin(noatun_splitplaylist ${noatun_splitplaylist_PART_SRCS})
 
+target_link_libraries(noatun_splitplaylist
+	${KDE4_KIO_LIBS}
+	noatun)
 
+# install plugin shared object
+install(TARGETS noatun_splitplaylist DESTINATION ${PLUGIN_INSTALL_DIR})
 
-target_link_libraries(noatun_splitplaylist  ${KDE4_KIO_LIBS} noatun )
+# Install XMLGUI file
+install(FILES splui.rc DESTINATION ${DATA_INSTALL_DIR}/noatun)
 
-install(TARGETS noatun_splitplaylist  DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-
-########### install files ###############
-
-install( FILES splitplaylist.plugin  DESTINATION  ${DATA_INSTALL_DIR}/noatun )
-install( FILES splui.rc  DESTINATION  ${DATA_INSTALL_DIR}/noatun )
-
-
-
-
+# Install services description
+install(FILES noatun_splitplaylist.desktop DESTINATION \
${SERVICES_INSTALL_DIR}/noatun)


[prev in list] [next in list] [prev in thread] [next in thread]