[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-29 13:31:55
Message-ID: 1185715915.710268.9300.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 693908 by hunger:

Clean up the CMakeList.txt files a bit.


 M  +28 -20    CMakeLists.txt  
 M  +2 -1      kontactplugin/CMakeLists.txt  


--- trunk/playground/pim/kcall/kcall/CMakeLists.txt #693907:693908
@@ -49,9 +49,11 @@
                        org.kde.KCall.Core.xml kcallcore_interface
 )
 
-kde4_add_kcfg_files( kcall_LIB_SRCS kcallsettings.kcfgc )
+KDE4_ADD_KCFG_FILES(kcall_LIB_SRCS kcallsettings.kcfgc)
 
-KDE4_ADD_UI_FILES(kcall_LIB_SRCS keypad.ui kcallview.ui vcardview.ui)
+KDE4_ADD_UI_FILES(kcall_LIB_SRCS
+                  keypad.ui kcallview.ui vcardview.ui
+)
 
 KDE4_ADD_LIBRARY(kcall SHARED ${kcall_LIB_SRCS} ${kcallcore_DBUS_IFACE})
 
@@ -63,48 +65,52 @@
                       ${DECIBEL_LDFLAGS}
 )
 
-set_target_properties(kcall PROPERTIES VERSION ${VERSION}
+SET_TARGET_PROPERTIES(kcall PROPERTIES VERSION ${VERSION}
                                        SOVERSION ${SO_VERSION}
 )
-install(TARGETS kcall  DESTINATION ${LIB_INSTALL_DIR})
+INSTALl(TARGETS kcall  DESTINATION ${LIB_INSTALL_DIR})
 
 ########### next target ###############
 
-set(kcall_bin_SRCS
-        main.cpp
-        kcallmainwindow.cpp
+SET(kcall_bin_SRCS
+    main.cpp
+    kcallmainwindow.cpp
 )
 
-qt4_add_dbus_adaptor(kcall_bin_SRCS org.kde.KCall.Core.xml kcallmainwindow.h \
KCallMainWindow kcalladaptor ) +QT4_ADD_DBUS_ADAPTOR(kcall_bin_SRCS \
org.kde.KCall.Core.xml +                     kcallmainwindow.h KCallMainWindow \
kcalladaptor +)
 
-kde4_add_executable(kcall_bin ${kcall_bin_SRCS})
-set_target_properties(kcall_bin PROPERTIES OUTPUT_NAME kcall)
+KDE4_ADD_EXECUTABLE(kcall_bin ${kcall_bin_SRCS})
+SET_TARGET_PROPERTIES(kcall_bin PROPERTIES OUTPUT_NAME kcall)
 
-target_link_libraries(kcall_bin
+TARGET_LINK_LIBRARIES(kcall_bin
                       kcall
                       ${KDE4_KHTML_LIBS}
                       ${DECIBEL_LDFLAGS})
 
-install(TARGETS kcall_bin  DESTINATION ${BIN_INSTALL_DIR} )
+INSTALL(TARGETS kcall_bin  DESTINATION ${BIN_INSTALL_DIR} )
 
 ########### next target ###############
 
-set(kcallpart_PART_SRCS kcall_part.cpp )
+SET(kcallpart_PART_SRCS kcall_part.cpp )
 
-qt4_add_dbus_adaptor(kcallpart_PART_SRCS org.kde.KCall.Core.xml kcall_part.h \
KCallPart kcallpartadaptor ) +QT4_ADD_DBUS_ADAPTOR(kcallpart_PART_SRCS \
org.kde.KCall.Core.xml +                     kcall_part.h KCallPart kcallpartadaptor
+)
 
-kde4_add_plugin(kcallpart WITH_PREFIX ${kcallpart_PART_SRCS})
+KDE4_ADD_PLUGIN(kcallpart WITH_PREFIX ${kcallpart_PART_SRCS})
 
-target_link_libraries(kcallpart  ${KDE4_KDECORE_LIBS} kcall )
+TARGET_LINK_LIBRARIES(kcallpart  ${KDE4_KDECORE_LIBS} kcall )
 
-install(TARGETS kcallpart  DESTINATION ${PLUGIN_INSTALL_DIR})
+INSTALL(TARGETS kcallpart DESTINATION ${PLUGIN_INSTALL_DIR})
 
 
 ########### install files ###############
 
 
-#install( FILES kcall.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
-install( FILES kcall.rc kcall_part.rc  DESTINATION ${DATA_INSTALL_DIR}/kcall)
+INSTALL(FILES kcall.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+INSTALL(FILES kcall.rc kcall_part.rc DESTINATION ${DATA_INSTALL_DIR}/kcall)
 
 
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE}
@@ -113,7 +119,9 @@
 INSTALL(FILES de.basyskom.kcallgui.streamchannel.component
         DESTINATION ${COMPONENT_SEARCH_DIR}
 )
-install( FILES org.kde.KCall.Core.xml DESTINATION ${DBUS_INTERFACES_DIR} )
+install(FILES org.kde.KCall.Core.xml
+        DESTINATION ${DBUS_INTERFACES_INSTALL_DIR}
+)
 
 #############
 
--- trunk/playground/pim/kcall/kcall/kontactplugin/CMakeLists.txt #693907:693908
@@ -15,7 +15,8 @@
 TARGET_LINK_LIBRARIES(kontact_kcallplugin
                       ${KDE4_KDECORE_LIBS}
                       ${KDE4_KABC_LIBS}
-                      kpinterfaces kdepim
+                      ${KDE4_KDEPIM_LIBS}
+                      kpinterfaces
 )
 
 INSTALL(TARGETS kontact_kcallplugin DESTINATION ${PLUGIN_INSTALL_DIR})


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