[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=6461c7a

The following commit has been merged in the master branch:
commit 6461c7acd9107a0529cffc64651582b7f259f2c8
Author: Daniele Elmo Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Aug 9 14:37:10 2010 +0000

    Updated FindKTelepathy.cmake and fixed CMakeLists.txt
    
    svn path=/trunk/playground/network/telepathy-contactlist/; revision=1161035
---
 CMakeLists.txt                     |  2 +-
 cmake/modules/FindKTelepathy.cmake | 24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 759241e..2c62ea1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ add_definitions (${KDE4_DEFINITIONS}
 include_directories (${KDE4_INCLUDES}
                      ${TELEPATHY_QT4_INCLUDE_DIR}
                      ${NEPOMUK_INCLUDES}
-                     ${KTELEPATHY_INCLUDES}
+                     ${KTELEPATHY_INCLUDE_DIRS}
                      "${CMAKE_CURRENT_BINARY_DIR}/ontologies"
 )
 
diff --git a/cmake/modules/FindKTelepathy.cmake b/cmake/modules/FindKTelepathy.cmake
index f1f8339..3f34148 100644
--- a/cmake/modules/FindKTelepathy.cmake
+++ b/cmake/modules/FindKTelepathy.cmake
@@ -10,18 +10,30 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 SET (KTELEPATHY_FIND_REQUIRED ${KTelepathy_FIND_REQUIRED})
-if (KTELEPATHY_INCLUDE_DIR AND KTELEPATHY_LIBRARIES)
+if (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
   # Already in cache, be silent
   set(KTELEPATHY_FIND_QUIETLY TRUE)
-endif (KTELEPATHY_INCLUDE_DIR AND KTELEPATHY_LIBRARIES)
+endif (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
 
 find_path(KTELEPATHY_INCLUDE_DIR
-  NAMES KTelepathy/AbstractTreeItem KTelepathy/abstract-tree-item.h)
+  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_DIR)
-
+                                  KTELEPATHY_LIBRARIES
+                                  KTELEPATHY_INCLUDE_DIRS)
 
-mark_as_advanced(KTELEPATHY_INCLUDE_DIR KTELEPATHY_LIBRARIES)
+mark_as_advanced(KTELEPATHY_INCLUDE_DIRS KTELEPATHY_LIBRARIES)

-- 
ktp-contact-list packaging