[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=3a19860

The following commit has been merged in the master branch:
commit 3a19860b9cb0f37e89e2e2f8e0a3230ca7c5a56f
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Aug 9 11:33:25 2012 +0100

    Move inclusion of TpLoggerQt include dirs to be global.
---
 CMakeLists.txt     | 3 +++
 lib/CMakeLists.txt | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5a3826..609a07a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,6 +33,9 @@ macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepathyLoggerQt4" "Qt4 wrapper a
 macro_display_feature_log()
 if(TELEPATHY_LOGGER_QT4_FOUND)
     add_definitions( -DTELEPATHY_LOGGER_QT4_FOUND )
+    include_directories(
+        ${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
+    )
 endif()
 
 add_subdirectory(lib)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index aed670a..1aa830b 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -57,10 +57,6 @@ kde4_add_library(ktpchat SHARED ${ktpchat_SRCS})
 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(ktpchat
         ${TELEPATHY_LOGGER_QT4_LIBRARIES}
     )

-- 
ktp-text-ui packaging