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

List:       kde-commits
Subject:    KDE/kdebase/kioslave
From:       Laurent Montel <montel () kde ! org>
Date:       2006-04-12 13:38:09
Message-ID: 1144849089.534854.5566.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 529054 by mlaurent:

Now kioslave/media compiles fine with cmake


 M  +1 -1      CMakeLists.txt  
 M  +5 -1      media/kcmodule/CMakeLists.txt  
 M  +1 -1      media/mediamanager/CMakeLists.txt  
 M  +6 -3      media/medianotifier/CMakeLists.txt  
 M  +3 -3      media/mounthelper/CMakeLists.txt  


--- trunk/KDE/kdebase/kioslave/CMakeLists.txt #529053:529054
@@ -25,7 +25,7 @@
 add_subdirectory( thumbnail ) 
 add_subdirectory( settings ) 
 add_subdirectory( trash ) 
-#add_subdirectory( media ) 
+add_subdirectory( media ) 
 add_subdirectory( remote ) 
 add_subdirectory( home ) 
 add_subdirectory( system )
--- trunk/KDE/kdebase/kioslave/media/kcmodule/CMakeLists.txt #529053:529054
@@ -11,6 +11,10 @@
    managermodule.cpp 
    main.cpp ${libmediacommon_SRCS})
 
+
+kde4_add_kcfg_files(kcm_media_PART_SRCS \
${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon/mediamanagersettings.kcfgc ) +
+
 kde4_automoc(${kcm_media_PART_SRCS})
 
 kde4_add_ui3_files(kcm_media_PART_SRCS notifiermoduleview.ui serviceview.ui \
managermoduleview.ui ) @@ -19,7 +23,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_media )
 
-target_link_libraries(kcm_media  ${KDE4_KDECORE_LIBS} mediacommon kio )
+target_link_libraries(kcm_media  ${KDE4_KIO_LIBS}  )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kcm_media )
 
--- trunk/KDE/kdebase/kioslave/media/mediamanager/CMakeLists.txt #529053:529054
@@ -21,7 +21,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kded_mediamanager )
 
-target_link_libraries(kded_mediamanager  ${KDE4_KDECORE_LIBS} mediacommon )
+target_link_libraries(kded_mediamanager  ${KDE4_KIO_LIBS} )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kded_mediamanager )
 
--- trunk/KDE/kdebase/kioslave/media/medianotifier/CMakeLists.txt #529053:529054
@@ -1,11 +1,14 @@
 kde4_header()
-include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} \
${KDE4_INCLUDES} ) +include_directories( \
${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon/ ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )  
 
 ########### next target ###############
 
-set(kded_medianotifier_PART_SRCS medianotifier.cpp notificationdialog.cpp )
+set(kded_medianotifier_PART_SRCS medianotifier.cpp notificationdialog.cpp \
${libmediacommon_SRCS} )  
+kde4_add_kcfg_files(kded_medianotifier_PART_SRCS \
${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon/mediamanagersettings.kcfgc ) +
+
 kde4_automoc(${kded_medianotifier_PART_SRCS})
 
 kde4_add_ui3_files(kded_medianotifier_PART_SRCS notificationdialogview.ui )
@@ -16,7 +19,7 @@
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kded_medianotifier )
 
-target_link_libraries(kded_medianotifier  ${KDE4_KDECORE_LIBS} mediacommon kdeui kio \
) +target_link_libraries(kded_medianotifier  ${KDE4_KIO_LIBS}  )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 kded_medianotifier )
 
--- trunk/KDE/kdebase/kioslave/media/mounthelper/CMakeLists.txt #529053:529054
@@ -1,16 +1,16 @@
 kde4_header()
-include_directories(  ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} \
${KDE4_INCLUDES} ) +include_directories( \
${CMAKE_SOURCE_DIR}/kioslave/media/libmediacommon/ ${CMAKE_CURRENT_SOURCE_DIR} \
${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES} )  
 
 ########### next target ###############
 
-set(kio_media_mounthelper_SRCS kio_media_mounthelper.cpp )
+set(kio_media_mounthelper_SRCS kio_media_mounthelper.cpp ${libmediacommon_SRCS} )
 
 kde4_automoc(${kio_media_mounthelper_SRCS})
 
 kde4_add_executable(kio_media_mounthelper ${kio_media_mounthelper_SRCS})
 
-target_link_libraries(kio_media_mounthelper  ${KDE4_KIO_LIBS} mediacommon )
+target_link_libraries(kio_media_mounthelper  ${KDE4_KIO_LIBS} )
 
 install_targets(/bin kio_media_mounthelper )
 


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