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

List:       kde-commits
Subject:    playground/pim/kcall/kcall
From:       Tobias Hunger <tobias.hunger () basyskom ! de>
Date:       2007-07-25 15:08:23
Message-ID: 1185376103.962244.6558.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 692435 by hunger:

Build KCallcore Iface for the contact plugin.


 M  +7 -5      CMakeLists.txt  
 M  +15 -11    kontactplugin/CMakeLists.txt  


--- trunk/playground/pim/kcall/kcall/CMakeLists.txt #692434:692435
@@ -1,6 +1,6 @@
-project(kcallgui)
+PROJECT(kcallgui)
 
-add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+ADD_DEFINITIONS(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
 #SET(QT_USE_QT3SUPPORT ON)
 
 INCLUDE(${QT_USE_FILE})
@@ -27,7 +27,6 @@
 
 ########### next target ###############
 
-
 SET(kcall_LIB_SRCS
     kcallcore.cpp
     decibeldialer.cpp 
@@ -45,13 +44,16 @@
                        Decibel/Types
 )
 
-QT4_ADD_DBUS_INTERFACE(kcall_LIB_SRCS org.kde.KCall.Core.xml kcallcore_interface )
 
+QT4_ADD_DBUS_INTERFACE(kcallcore_DBUS_IFACE
+                       org.kde.KCall.Core.xml kcallcore_interface
+)
+
 kde4_add_kcfg_files( kcall_LIB_SRCS kcallsettings.kcfgc )
 
 KDE4_ADD_UI_FILES(kcall_LIB_SRCS keypad.ui kcallview.ui vcardview.ui)
 
-kde4_add_library(kcall SHARED ${kcall_LIB_SRCS})
+KDE4_ADD_LIBRARY(kcall SHARED ${kcall_LIB_SRCS} ${kcallcore_DBUS_IFACE})
 
 TARGET_LINK_LIBRARIES(kcall
                       ${KDE4_KDEUI_LIBS}
--- trunk/playground/pim/kcall/kcall/kontactplugin/CMakeLists.txt #692434:692435
@@ -1,22 +1,26 @@
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../  )
 
-include_directories( ${CMAKE_SOURCE_DIR}/kcall/kcall  )
-
-
 ########### next target ###############
 
-set(kontact_kcallplugin_PART_SRCS kcall_plugin.cpp )
+SET(kontact_kcallplugin_PART_SRCS kcall_plugin.cpp )
 
-#qt4_add_dbus_interfaces(kontact_kcallplugin_PART_SRCS \
${CMAKE_SOURCE_DIR}/kcall/kcall/org.kde.KCall.Core.xml ) \
+QT4_ADD_DBUS_INTERFACE(kontact_kcallplugin_PART_SRCS +                       \
../org.kde.KCall.Core.xml kcallcore_interface +)
 
-kde4_add_plugin(kontact_kcallplugin WITH_PREFIX ${kontact_kcallplugin_PART_SRCS})
+KDE4_ADD_PLUGIN(kontact_kcallplugin
+                WITH_PREFIX ${kontact_kcallplugin_PART_SRCS}
+)
 
+TARGET_LINK_LIBRARIES(kontact_kcallplugin
+                      ${KDE4_KDECORE_LIBS}
+                      ${KDE4_KABC_LIBS}
+                      kpinterfaces kdepim
+)
 
-target_link_libraries(kontact_kcallplugin  ${KDE4_KDECORE_LIBS} ${KDE4_KABC_LIBS} \
kpinterfaces kdepim ) +INSTALL(TARGETS kontact_kcallplugin DESTINATION \
${PLUGIN_INSTALL_DIR})  
-install(TARGETS kontact_kcallplugin  DESTINATION ${PLUGIN_INSTALL_DIR})
-
-
 ########### install files ###############
 
-install( FILES kcallplugin.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
+INSTALL( FILES kcallplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
 


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