[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=e8f5d92

The following commit has been merged in the master branch:
commit e8f5d92a377e890373fb116dd3800446be8e953f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Jul 3 10:28:59 2013 +0100

    Only link against libkpeople for libkpeople builds
---
 CMakeLists.txt | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fdd34e..2362f93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,27 @@ set (ktp_contactlist_SRCS
      tooltips/persontooltip.cpp
 )
 
+
+
+set (ktp_contactlist_LIBS
+    ${KTP_LIBRARIES}
+    ${KTP_MODELS_LIBRARIES}
+    ${KTP_WIDGETS_LIBRARIES}
+    ${KDE4_KDEUI_LIBS}
+    ${KDE4_KIO_LIBS}
+    ${KDE4_KCMUTILS_LIBS}
+    ${TELEPATHY_LOGGER_QT4_LIBRARIES}
+    ${KDE4_KNOTIFYCONFIG_LIBS}
+    )
+
+if(KPEOPLE_FOUND)
+set (ktp_contactlist_LIBS
+    ${ktp_contactlist_LIBS}
+    kpeople
+)
+endif(KPEOPLE_FOUND)
+
+
 configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
 kde4_add_ui_files (ktp_contactlist_SRCS
@@ -76,16 +97,7 @@ kde4_add_executable (ktp-contactlist
 )
 
 target_link_libraries (ktp-contactlist
-                       ${TELEPATHY_QT4_LIBRARIES}
-                       ${KTP_LIBRARIES}
-                       ${KTP_MODELS_LIBRARIES}
-                       ${KTP_WIDGETS_LIBRARIES}
-                       ${KDE4_KDEUI_LIBS}
-                       ${KDE4_KIO_LIBS}
-                       ${KDE4_KCMUTILS_LIBS}
-                       ${TELEPATHY_LOGGER_QT4_LIBRARIES}
-                       ${KDE4_KNOTIFYCONFIG_LIBS}
-                       kpeople
+                     ${ktp_contactlist_LIBS}
 )
 
 

-- 
ktp-contact-list packaging