SVN commit 629300 by mlaurent:

Fix install files


 M  +0 -1      CMakeLists.txt  
 M  +6 -6      konquisidebar/CMakeLists.txt  
 M  +1 -29     loader/CMakeLists.txt  
 M  +0 -23     mediadevice/CMakeLists.txt  
 D             statusbar/CMakeLists.txt  
 M  +0 -6      themes/CMakeLists.txt  
 M  +1 -12     themes/example/CMakeLists.txt  
 M  +1 -12     themes/reinhardt/CMakeLists.txt  
 M  +1 -14     themes/reinhardt/images/CMakeLists.txt  
 M  +1 -5      vis/libvisual/CMakeLists.txt  


--- trunk/extragear/multimedia/amarok/src/CMakeLists.txt #629299:629300
@@ -25,7 +25,6 @@
 add_subdirectory( themes )
 add_subdirectory( vis )
 add_subdirectory( metadata )
-add_subdirectory( statusbar )
 add_subdirectory( engine )
 add_subdirectory( mediadevice )
 add_subdirectory( collectionscanner )
--- trunk/extragear/multimedia/amarok/src/konquisidebar/CMakeLists.txt #629299:629300
@@ -8,23 +8,23 @@
 
 kde4_automoc(${konqsidebar_universalamarok_PART_SRCS})
 
-kde4_add_dcop_stubs(konqsidebar_universalamarok_PART_SRCS ${CMAKE_SOURCE_DIR}/amarok/src/amarokcore/amarokdcopiface.h )
+#kde4_add_dcop_stubs(konqsidebar_universalamarok_PART_SRCS ${CMAKE_SOURCE_DIR}/amarok/src/amarokcore/amarokdcopiface.h )
 
 
 kde4_add_plugin(konqsidebar_universalamarok ${konqsidebar_universalamarok_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} konqsidebar_universalamarok )
 
-target_link_libraries(konqsidebar_universalamarok  ${KDE4_KDECORE_LIBS} konqsidebarplugin ${KDE4_KHTML_LIBS} ${KDE4_KPARTS_LIBS} )
+target_link_libraries(konqsidebar_universalamarok  konqsidebarplugin ${KDE4_KHTML_LIBS} ${KDE4_KPARTS_LIBS} )
 
-install_targets(${PLUGIN_INSTALL_DIR} konqsidebar_universalamarok )
+install(TARGETS konqsidebar_universalamarok DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
 ########### install files ###############
 
-install_files( ${DATA_INSTALL_DIR}/konqsidebartng/entries FILES  amarok.desktop )
-install_files( ${DATA_INSTALL_DIR}/konqsidebartng/kicker_entries FILES  amarok.desktop )
-install_files( ${DATA_INSTALL_DIR}/konqsidebartng/add FILES  amarok.desktop )
+install( FILES amarok.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/entries )
+install( FILES  amarok.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/kicker_entries)
+install( FILES amarok.desktop DESTINATION ${DATA_INSTALL_DIR}/konqsidebartng/add )
 
 
 
--- trunk/extragear/multimedia/amarok/src/loader/CMakeLists.txt #629299:629300
@@ -1,5 +1,3 @@
-
-
 ########### next target ###############
 
 set(amarok_bin_SRCS loader.cpp splash.cpp )
@@ -12,30 +10,4 @@
 
 target_link_libraries(amarok_bin  ${KDE4_KDECORE_LIBS} )
 
-install_targets(/bin amarok_bin )
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#bin_PROGRAMS = amarok
-#
-#INCLUDES = \
-#        $(all_includes)
-#
-#amarok_SOURCES = \
-#        loader.cpp \
-#        splash.cpp
-#
-#amarok_LDADD = \
-#        $(LIB_QT) \
-#        $(LIB_KDECORE)
-#
-#amarok_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-#
-#METASOURCES = AUTO
-#
+install(TARGETS amarok_bin DESTINATION ${BIN_INSTALL_DIR} )
--- trunk/extragear/multimedia/amarok/src/mediadevice/CMakeLists.txt #629299:629300
@@ -13,26 +13,3 @@
 #add_subdirectory(ipod)
 
 
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#if with_libgpod
-#    IPOD_SUBDIR = ipod
-#endif
-#
-#if with_ifp
-#    IFP_SUBDIR = ifp
-#endif
-#
-#if with_libnjb
-#    NJB_SUBDIR = njb
-#endif
-#
-#METASOURCES = AUTO
-#
-#SUBDIRS = 
-#
--- trunk/extragear/multimedia/amarok/src/themes/CMakeLists.txt #629299:629300
@@ -4,9 +4,3 @@
 
 
 
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = example reinhardt
-#
-#
--- trunk/extragear/multimedia/amarok/src/themes/example/CMakeLists.txt #629299:629300
@@ -1,13 +1,2 @@
+install_files(FILES  stylesheet.css DESTINATION  ${DATA_INSTALL_DIR}/amarok/themes/example )
 
-
-########### install files ###############
-
-install_files( ${DATA_INSTALL_DIR}/amarok/themes/example FILES  stylesheet.css )
-
-
-
-#original Makefile.am contents follow:
-
-#defaultdir = $(kde_datadir)/amarok/themes/example
-#
-#default_DATA = stylesheet.css
--- trunk/extragear/multimedia/amarok/src/themes/reinhardt/CMakeLists.txt #629299:629300
@@ -1,16 +1,5 @@
 
 add_subdirectory( images )
 
-########### install files ###############
 
-install_files( ${DATA_INSTALL_DIR}/amarok/themes/reinhardt FILES  stylesheet.css )
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = images
-#
-#reinhardtdir = $(kde_datadir)/amarok/themes/reinhardt
-#
-#reinhardt_DATA = stylesheet.css
+install_files(FILES stylesheet.css DESTINATION ${DATA_INSTALL_DIR}/amarok/themes/reinhardt )
--- trunk/extragear/multimedia/amarok/src/themes/reinhardt/images/CMakeLists.txt #629299:629300
@@ -1,15 +1,2 @@
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
-
-
-########### install files ###############
-
-install_files( ${DATA_INSTALL_DIR}/amarok/themes/reinhardt/images FILES  background.png transparency.png )
-
-
-
-#original Makefile.am contents follow:
-
-#reinhardtimagesdir = $(kde_datadir)/amarok/themes/reinhardt/images
-#
-#reinhardtimages_DATA = background.png transparency.png
+install(FILES background.png transparency.png DESTINATION ${DATA_INSTALL_DIR}/amarok/themes/reinhardt/images)
--- trunk/extragear/multimedia/amarok/src/vis/libvisual/CMakeLists.txt #629299:629300
@@ -1,7 +1,3 @@
-
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
-
-
 ########### next target ###############
 
 set(amarok_libvisual_SRCS libvisual.cpp )
@@ -12,7 +8,7 @@
 
 target_link_libraries(amarok_libvisual  ${KDE4_KDECORE_LIBS} )
 
-install_targets(/bin amarok_libvisual )
+install(TARGETS amarok_libvisual DESTINATION ${BIN_INSTALL_DIR})
 
 
 ########### install files ###############