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

List:       kde-commits
Subject:    playground/network/kcall
From:       Andre Moreira Magalhaes <andrunko () yahoo ! com ! br>
Date:       2009-07-20 20:05:24
Message-ID: 1248120324.775690.14532.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1000087 by andrunko:

Improved cmake detection of TelepathyQt4 libraries.

Split TelepathyQt4 cmake modules in FindTelepathyQt4 and FindTelepathyQt4Farsight.
Use pkg-config to find TelepathyQt4 related libraries.


 M  +3 -1      CMakeLists.txt  
 M  +27 -20    cmake/modules/FindTelepathyQt4.cmake  
 A             cmake/modules/FindTelepathyQt4Farsight.cmake  


--- trunk/playground/network/kcall/CMakeLists.txt #1000086:1000087
@@ -4,6 +4,7 @@
 
 find_package(KDE4 REQUIRED)
 find_package(TelepathyQt4 REQUIRED)
+find_package(TelepathyQt4Farsight REQUIRED)
 find_package(LibKNotificationItem-1 REQUIRED)
 find_package(GStreamer REQUIRED)
 find_package(GObject REQUIRED)
@@ -32,7 +33,7 @@
 endif (NOT QT4_GLIB_SUPPORT)
 
 
-include_directories(${KDE4_INCLUDES} ${TELEPATHY_QT4_INCLUDE_DIR}
+include_directories(${KDE4_INCLUDES} ${TELEPATHY_QT4_INCLUDE_DIR} \
                ${TELEPATHY_QT4_FARSIGHT_INCLUDE_DIR}
                     ${KNOTIFICATIONITEM_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 add_definitions(${KDE4_DEFINITIONS})
 
@@ -61,6 +62,7 @@
 kde4_add_executable(kcall ${kcall_SRCS})
 target_link_libraries(kcall ${KDE4_KUTILS_LIBS}
                             ${TELEPATHY_QT4_LIBRARIES}
+                            ${TELEPATHY_QT4_FARSIGHT_LIBRARIES}
                             ${KNOTIFICATIONITEM_LIBRARIES}
                             kcallprivate)
 
--- trunk/playground/network/kcall/cmake/modules/FindTelepathyQt4.cmake \
#1000086:1000087 @@ -1,32 +1,39 @@
-# Try to find the Qt binding of the Telepathy library
-# TELEPATHY_QT_FOUND - system has Telepathy-Qt
-# TELEPATHY_QT_INCLUDE_DIR - the Telepathy-Qt include directory
-# TELEPATHY_QT_LIBRARIES - Link these to use Telepathy-Qt
+# Try to find the Qt4 binding of the Telepathy library
+# TELEPATHY_QT4_FOUND - system has TelepathyQt4
+# TELEPATHY_QT4_INCLUDE_DIR - the TelepathyQt4 include directory
+# TELEPATHY_QT4_LIBRARIES - Link these to use TelepathyQt4
 
 # Copyright (c) 2008, Allen Winter <winter@kde.org>
+# Copyright (c) 2009, Andre Moreira Magalhaes <andrunko@gmail.com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-set (TELEPATHY_QT4_FIND_REQUIRED ${TelepathyQt4_FIND_REQUIRED})
-if (TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
+set(TELEPATHY_QT4_FIND_REQUIRED ${TelepathyQt4_FIND_REQUIRED})
+if(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
   # Already in cache, be silent
-  set (TELEPATHY_QT4_FIND_QUIETLY TRUE)
-endif (TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
+  set(TELEPATHY_QT4_FIND_QUIETLY TRUE)
+endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
 
-find_path (TELEPATHY_QT4_INCLUDE_DIR
-          NAMES TelepathyQt4/Channel TelepathyQt4/Connection TelepathyQt4/Types
-          PATHS ${CMAKE_INSTALL_PREFIX}/include/telepathy-1.0
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.1.8)
+endif(PKG_CONFIG_FOUND)
+
+find_path(TELEPATHY_QT4_INCLUDE_DIR
+          NAMES TelepathyQt4/Types
+          HINTS
+          ${PC_TELEPATHY_QT4_INCLUDEDIR}
+          ${PC_TELEPATHY_QT4_INCLUDE_DIRS}
 )
-find_library (TELEPATHY_QT4_LIBRARIES
+
+find_library(TELEPATHY_QT4_LIBRARIES
              NAMES telepathy-qt4
-             PATHS ${CMAKE_INSTALL_PREFIX}/lib
+             HINTS
+             ${PC_TELEPATHY_QT4_LIBDIR}
+             ${PC_TELEPATHY_QT4_LIBRARY_DIRS}
 )
-find_library (TELEPATHY_QT4_FARSIGHT_LIBRARIES
-             NAMES telepathy-qt4-farsight
-             PATHS ${CMAKE_INSTALL_PREFIX}/lib
-)
 
-include (FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (TELEPATHY_QT4 DEFAULT_MSG
-                                   TELEPATHY_QT4_LIBRARIES \
TELEPATHY_QT4_FARSIGHT_LIBRARIES TELEPATHY_QT4_INCLUDE_DIR) \
+include(FindPackageHandleStandardArgs) \
+find_package_handle_standard_args(TELEPATHY_QT4 DEFAULT_MSG +                        \
TELEPATHY_QT4_LIBRARIES TELEPATHY_QT4_INCLUDE_DIR)


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