[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=4cc338c

The following commit has been merged in the master branch:
commit 4cc338c14e71b92cd998c7c0f3fa1492049f68f6
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Sat Dec 7 00:32:35 2013 +0100

    Make PIM libs required if building in KPeople mode
    
    Also add its include dirs
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0f97def..3cf039d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,6 @@ find_package (KDE4 4.4.75 REQUIRED)
 find_package (TelepathyQt4 0.9.3 REQUIRED)
 find_package (KTp REQUIRED)
 find_package (KPeople QUIET)
-find_package (KdepimLibs QUIET)
 
 
 macro_log_feature(KPEOPLE_FOUND "KPeople" "Support for KDE Contact Aggregation" "https://projects.kde.org/libkpeople" FALSE "" "")
@@ -21,7 +20,8 @@ macro_display_feature_log()
 
 if (KPEOPLE_FOUND)
     add_definitions(-DHAVE_KPEOPLE)
-    include_directories(${KPEOPLE_INCLUDES})
+    include_directories(${KPEOPLE_INCLUDES} ${KDEPIMLIBS_INCLUDE_DIRS})
+    find_package (KdepimLibs REQUIRED)
 endif (KPEOPLE_FOUND)
 
 include (KDE4Defaults)

-- 
ktp-contact-list packaging