[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=5c1656c

The following commit has been merged in the master branch:
commit 5c1656ccbf9f227ef48dae6fb478edf862573f70
Author: Leon Handreke <leonh at ndreke.de>
Date:   Thu Jan 23 11:05:03 2014 +0100

    Only build with metacontact support if kdepimlibs was also found
    
    REVIEW: 115252
---
 CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b6fa13..03f44da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,6 +17,7 @@ find_package (KDE4 REQUIRED)
 find_package (TelepathyQt4 0.9.2.1 REQUIRED)
 find_package (TelepathyLoggerQt4)
 find_package (KPeople 0.2)
+find_package (KdepimLibs)
 
 # set some default settings
 include (KDE4Defaults)
@@ -25,6 +26,7 @@ include (KDE4Defaults)
 include (MacroLibrary)
 
 macro_log_feature(KPEOPLE_FOUND "KPeople" "Support for KDE Contact Aggregation" "https://projects.kde.org/libkpeople" FALSE "" "")
+macro_log_feature(KDEPIMLIBS_FOUND "KDE-PIM Libraries" "Support for Contact Aggregation" "https://projects.kde.org/kdepimlibs" FALSE "" "")
 macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepatyLoggerQt4" "Qt bindings for TelepathyLogger. This is needed to provide access to chat logs. HIGHLY recommended" "http://projects.kde.org/telepathy-logger-qt" FALSE "" "")
 macro_display_feature_log()
 
@@ -46,12 +48,11 @@ if (TELEPATHY_LOGGER_QT4_FOUND)
     include_directories(${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS})
 endif (TELEPATHY_LOGGER_QT4_FOUND)
 
-if (KPEOPLE_FOUND)
-    find_package (KdepimLibs REQUIRED)
+if (KPEOPLE_FOUND AND KDEPIMLIBS_FOUND)
     include_directories (${KDEPIMLIBS_INCLUDE_DIRS})
     add_definitions(-DHAVE_KPEOPLE)
     add_subdirectory(kpeople)
-endif (KPEOPLE_FOUND)
+endif (KPEOPLE_FOUND AND KDEPIMLIBS_FOUND)
 
 
 configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)

-- 
ktp-common-internals packaging