[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/network/telepathy-accounts-kcm/cmake/modules
From: Andre Moreira Magalhaes <andrunko () yahoo ! com ! br>
Date: 2009-07-23 7:06:09
Message-ID: 1248332769.928157.32567.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1001400 by andrunko:
Updated FindTelepathyQt4.cmake to require latest TelepathyQt4 and use \
pkg-config.
M +27 -16 FindTelepathyQt4.cmake
--- trunk/playground/network/telepathy-accounts-kcm/cmake/modules/FindTelepathyQt4.cmake \
#1001399:1001400 @@ -1,28 +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/Client/Channel TelepathyQt4/Client/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}
)
-include (FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS (TELEPATHY_QT4 DEFAULT_MSG
- TELEPATHY_QT4_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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic