[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=9c2f036

The following commit has been merged in the master branch:
commit 9c2f03646f62bca15cd3cd8cdf3b50809621a29d
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Sun Jan 29 13:09:47 2012 +0000

    Normalise CMakeLists
---
 CMakeLists.txt           | 7 +++++++
 lib/CMakeLists.txt       | 7 -------
 logviewer/CMakeLists.txt | 4 ----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42d3d8e..b280605 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,6 +27,13 @@ add_definitions (${KDE4_DEFINITIONS}
                  -DQT_NO_CAST_FROM_ASCII
                  -DQT_NO_KEYWORDS)
 
+macro_optional_find_package(TelepathyLoggerQt4)
+macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepathyLoggerQt4" "Qt4 wrapper around telepathy-logger" FALSE "" "Needed for optional backlog support in the chat-window")
+macro_display_feature_log()
+if(TELEPATHY_LOGGER_QT4_FOUND)
+    add_definitions( -DTELEPATHY_LOGGER_QT4_FOUND )
+endif()
+
 add_subdirectory(lib)
 add_subdirectory(app)
 add_subdirectory(config)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 5d39a62..e22da23 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,10 +1,3 @@
-macro_optional_find_package(TelepathyLoggerQt4)
-macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepathyLoggerQt4" "Qt4 wrapper around telepathy-logger" FALSE "" "Needed for optional backlog support in the chat-window")
-macro_display_feature_log()
-if(TELEPATHY_LOGGER_QT4_FOUND)
-    add_definitions( -DTELEPATHY_LOGGER_QT4_FOUND )
-endif()
-
 set(ktpchat_SRCS
         chat-widget.cpp
         chat-window-style.cpp
diff --git a/logviewer/CMakeLists.txt b/logviewer/CMakeLists.txt
index fc76e9b..28aa862 100644
--- a/logviewer/CMakeLists.txt
+++ b/logviewer/CMakeLists.txt
@@ -1,7 +1,3 @@
-macro_optional_find_package(TelepathyLoggerQt4)
-macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepathyLoggerQt4" "Qt4 wrapper around telepathy-logger" FALSE "" "Needed for optional backlog support in the chat-window")
-macro_display_feature_log()
-
 #Only do anything with this app if the logger is available.
 if(TELEPATHY_LOGGER_QT4_FOUND)
     add_definitions( -DTELEPATHY_LOGGER_QT4_FOUND )

-- 
ktp-text-ui packaging