[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=56acfab

The following commit has been merged in the master branch:
commit 56acfab2e1ffade833845e0c9e5571fda529585b
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Fri Sep 21 15:18:25 2012 +0200

    Compile the whole ktp-text-ui with exceptions enabled if using tp-logger-qt
    
    This fixes the build for plasmoid and plugins after f4eb87771d6a123951f1e85d7fa27eb6fdf6c997
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 CMakeLists.txt           | 1 +
 lib/CMakeLists.txt       | 2 --
 logviewer/CMakeLists.txt | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd70594..1d1d72b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ if(TELEPATHY_LOGGER_QT4_FOUND)
     include_directories(
         ${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
     )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TELEPATHY_LOGGER_QT4_DEFINITIONS}" )
 endif()
 
 add_subdirectory(lib)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 467c1eb..6098dd8 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -57,8 +57,6 @@ kde4_add_library(ktpchat SHARED ${ktpchat_SRCS})
 
 # telepathy-logger-qt4 related stuff
 if(TELEPATHY_LOGGER_QT4_FOUND)
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TELEPATHY_LOGGER_QT4_DEFINITIONS}" )
-
     target_link_libraries(ktpchat
         ${TELEPATHY_LOGGER_QT4_LIBRARIES}
     )
diff --git a/logviewer/CMakeLists.txt b/logviewer/CMakeLists.txt
index e1e04a9..30d08ab 100644
--- a/logviewer/CMakeLists.txt
+++ b/logviewer/CMakeLists.txt
@@ -2,10 +2,6 @@
 if(TELEPATHY_LOGGER_QT4_FOUND)
     add_definitions( -DTELEPATHY_LOGGER_QT4_FOUND )
 
-
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TELEPATHY_LOGGER_QT4_DEFINITIONS}" )
-
-
 include_directories(${CMAKE_SOURCE_DIR}/lib
                     ${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS}
                    )

-- 
ktp-text-ui packaging