[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=148aea2

The following commit has been merged in the master branch:
commit 148aea23e2dc851a95c0fafbb8b0f1a489ece791
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Thu Oct 13 03:38:20 2011 +0200

    Don't break on missing TpLoggerQt4 deps
---
 lib/CMakeLists.txt | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index aef1353..8ffc494 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -54,13 +54,19 @@ kde4_add_ui_files(telepathy_chat_handler_lib_SRCS ${telepathy_chat_handler_lib_U
 kde4_add_library(ktelepathy_chat_lib SHARED ${telepathy_chat_handler_lib_SRCS})
 
 # telepathy-logger-qt4 related stuff
-SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TELEPATHY_LOGGER_QT4_DEFINITIONS}" )
-include_directories(
-    ${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
-)
+if(TELEPATHY_LOGGER_QT4_FOUND)
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TELEPATHY_LOGGER_QT4_DEFINITIONS}" )
+
+    include_directories(
+        ${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
+    )
+
+    target_link_libraries(ktelepathy_chat_lib
+        ${TELEPATHY_LOGGER_QT4_LIBRARIES}
+    )
+endif()
 
 target_link_libraries(ktelepathy_chat_lib
-    ${TELEPATHY_LOGGER_QT4_LIBRARIES}
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KIO_LIBS}
     ${KDE4_KDEUI_LIBS}

-- 
ktp-text-ui packaging