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

List:       kde-commits
Subject:    playground/pim/kcall
From:       Tobias Hunger <tobias.hunger () basyskom ! de>
Date:       2007-07-22 17:19:58
Message-ID: 1185124798.944559.28697.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 690990 by hunger:

Use pkg-config to find Decibel.


 M  +3 -11     CMakeLists.txt  
 M  +21 -17    kcall/CMakeLists.txt  


--- trunk/playground/pim/kcall/CMakeLists.txt #690989:690990
@@ -6,10 +6,12 @@
 FIND_PACKAGE(Qt4 REQUIRED)
 FIND_PACKAGE(KDE4 REQUIRED)
 FIND_PACKAGE(KdepimLibs REQUIRED)
-INCLUDE(UsePkgConfig REQUIRED)
+INCLUDE(FindPkgConfig REQUIRED)
 INCLUDE(FindDoxygen)
 INCLUDE(Qt4DBusMacros)
 
+PKG_SEARCH_MODULE(DECIBEL REQUIRED Decibel)
+
 IF (APPLE)
     SET(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
     SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
@@ -60,16 +62,6 @@
 )
 
 
-PKGCONFIG(QtTapioca
-          QTTAPIOCA_INC_DIR
-          QTTAPIOCA_LIB_DIR
-          QTTAPIOCA_LDFLAGS
-          QTTAPIOCA_CFLAGS
-)
-FIND_LIBRARY(QTTAPIOCA_LIBRARIES NAMES QtTapioca
-    PATHS ${QTTAPIOCA_LIB_DIR}
-)
-
 ADD_SUBDIRECTORY(kcall)
 #ADD_SUBDIRECTORY(applet) 
 
--- trunk/playground/pim/kcall/kcall/CMakeLists.txt #690989:690990
@@ -14,6 +14,7 @@
                     ${QT_QTXML_INCLUDE_DIR}
                     ${QTTAPIOCA_INC_DIR}
                     ${KDE4_INCLUDE_DIR}
+                    ${DECIBEL_INCLUDE_DIR}
                     ${KDEPIMLIBS_INCLUDE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
                     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -27,23 +28,7 @@
 
 ########### next target ###############
 
-set(kcall_bin_SRCS
-	main.cpp 
-#kcallmain.cpp 
-	)
 
-#qt4_add_dbus_adaptor(kaddressbook_bin_SRCS org.kde.KAddressbook.Core.xml \
                kaddressbookmain.h KAddressBookMain kaddressbookadaptor )
-
-kde4_add_executable(kcall_bin ${kcall_bin_SRCS})
-set_target_properties(kcall_bin PROPERTIES OUTPUT_NAME kcall)
-
-target_link_libraries(kcall_bin kcall ${KDE4_KHTML_LIBS})
-
-install(TARGETS kcall_bin  DESTINATION ${BIN_INSTALL_DIR} )
-
-########### next target ###############
-
-
 SET(kcall_LIB_SRCS
     kcallcore.cpp
     decibeldialer.cpp 
@@ -69,14 +54,33 @@
 TARGET_LINK_LIBRARIES(kcall
                       ${KDE4_KDEUI_LIBS}
                       ${KDE4_KABC_LIBS}
-                      decibel
                       ${KDE4_KDE3SUPPORT_LIBS}
                       ${QT_QT3SUPPORT_LIBS}
+                      ${DECIBEL_LDFLAGS}
 )
 
 set_target_properties(kcall PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION} )  install(TARGETS kcall  DESTINATION ${LIB_INSTALL_DIR})
 
+########### next target ###############
+
+set(kcall_bin_SRCS
+        main.cpp
+#kcallmain.cpp
+)
+
+#qt4_add_dbus_adaptor(kaddressbook_bin_SRCS org.kde.KAddressbook.Core.xml \
kaddressbookmain.h KAddressBookMain kaddressbookadaptor ) +
+kde4_add_executable(kcall_bin ${kcall_bin_SRCS})
+set_target_properties(kcall_bin PROPERTIES OUTPUT_NAME kcall)
+
+target_link_libraries(kcall_bin
+                      kcall
+                      ${KDE4_KHTML_LIBS}
+                      ${DECIBEL_LDFLAGS})
+
+install(TARGETS kcall_bin  DESTINATION ${BIN_INSTALL_DIR} )
+
 ########### install files ###############
 
 


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