[SCM] ktp-send-file packaging branch, master, updated. debian/15.12.1-2-216-g8f07cdf

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=391f5e8

The following commit has been merged in the master branch:
commit 391f5e87cb4922f502f8d695b6cdbe92e098edf7
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue May 10 02:07:21 2011 +0100

    Add cmake module to find TpQt4
---
 CMakeLists.txt                       |  8 ++++++++
 cmake/modules/FindKTelepathy.cmake   | 39 ++++++++++++++++++++++++++++++++++++
 cmake/modules/FindTelepathyQt4.cmake | 39 ++++++++++++++++++++++++++++++++++++
 3 files changed, 86 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efd7931..2b81487 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,18 @@
 project(telepathy-dolphin-file-transfer-app)
 
+set (CMAKE_MODULE_PATH
+     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
+     ${CMAKE_MODULE_PATH}
+)
+
 find_package(KDE4 REQUIRED)
+find_package(TelepathyQt4 REQUIRED)
+
 include(KDE4Defaults)
 include(MacroLibrary)
 
 
+
 # Add the compiler flags
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 include_directories(
diff --git a/cmake/modules/FindKTelepathy.cmake b/cmake/modules/FindKTelepathy.cmake
new file mode 100644
index 0000000..3f34148
--- /dev/null
+++ b/cmake/modules/FindKTelepathy.cmake
@@ -0,0 +1,39 @@
+# Try to find the KTelepathy library
+# KTELEPATHY_FOUND - system has libkcmtelepathyaccounts
+# KTELEPATHY_INCLUDE_DIR - the kcmtelepathyaccounts include directory
+# KTELEPATHY_LIBRARIES - Link these to use libkcmtelepathyaccounts
+
+# Copyright (c) 2008, Allen Winter <winter at kde.org>
+# Copyright (c) 2010, Daniele E. Domenichelli <daniele.domenichelli at 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 (KTELEPATHY_FIND_REQUIRED ${KTelepathy_FIND_REQUIRED})
+if (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
+  # Already in cache, be silent
+  set(KTELEPATHY_FIND_QUIETLY TRUE)
+endif (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
+
+find_path(KTELEPATHY_INCLUDE_DIR
+  NAMES abstract-tree-item.h
+  PATHS ${KDE4_INCLUDE_DIR}
+  PATH_SUFFIXES ktelepathy
+)
+
+find_path(KTELEPATHY_INCLUDE_DIRS
+  NAMES KTelepathy/AbstractTreeItem
+  PATHS ${KDE4_INCLUDE_DIR}
+  PATH_SUFFIXES KDE
+)
+
+set(KTELEPATHY_INCLUDE_DIRS ${KTELEPATHY_INCLUDE_DIRS} ${KTELEPATHY_INCLUDE_DIR})
+
+find_library(KTELEPATHY_LIBRARIES NAMES ktelepathy )
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTELEPATHY DEFAULT_MSG
+                                  KTELEPATHY_LIBRARIES
+                                  KTELEPATHY_INCLUDE_DIRS)
+
+mark_as_advanced(KTELEPATHY_INCLUDE_DIRS KTELEPATHY_LIBRARIES)
diff --git a/cmake/modules/FindTelepathyQt4.cmake b/cmake/modules/FindTelepathyQt4.cmake
new file mode 100644
index 0000000..b4d4868
--- /dev/null
+++ b/cmake/modules/FindTelepathyQt4.cmake
@@ -0,0 +1,39 @@
+# 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 at kde.org>
+# Copyright (c) 2009, Andre Moreira Magalhaes <andrunko at 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)
+  # Already in cache, be silent
+  set(TELEPATHY_QT4_FIND_QUIETLY TRUE)
+endif(TELEPATHY_QT4_INCLUDE_DIR AND TELEPATHY_QT4_LIBRARIES)
+
+find_package(PkgConfig)
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_TELEPATHY_QT4 QUIET TelepathyQt4>=0.1.9)
+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
+             NAMES telepathy-qt4
+             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)

-- 
ktp-send-file packaging