From 0ba4e3c0a468d0ce3d64c4062a39e8a792b29b93 Mon Sep 17 00:00:00 2001
From: samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Tue, 11 Jan 2011 16:43:23 +0000
Subject: [kdelibs] move "-include tqt.h" directive to CMAKE_CXX_FLAGS; move
 TQT_CFLAGS_OTHER definitions to main CMakeLists.txt; remove useless
 defintions

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1213800 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdecore/CMakeLists.txt                  | 6 +-----
 kdecore/kconfig_compiler/CMakeLists.txt | 4 ----
 kdecore/network/CMakeLists.txt          | 4 ----
 kdecore/svgicons/CMakeLists.txt         | 4 ----
 4 files changed, 1 insertion(+), 17 deletions(-)

(limited to 'kdecore')

diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt
index c475c89c3..3e37ed20c 100644
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
@@ -18,10 +18,6 @@ if( WITH_LIBART )
   set( KDESVGICONS kdesvgicons-static )
 endif( WITH_LIBART )
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-  -include tqt.h
-)
 
 include_directories(
   ${TQT_INCLUDE_DIRS}
@@ -133,7 +129,7 @@ tde_add_library( ${target} SHARED AUTOMOC
   SOURCES ${${target}_SRCS}
   VERSION 4.2.0
   EMBED kdecorenetwork-static
-  LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES}
+  LINK ltdlc-static ${KDESVGICONS} DCOP-shared kdefx-shared ${ZLIB_LIBRARIES} ${LIBIDN_LIBRARIES} ICE SM
   DEPENDENCIES dcopidl dcopidl2cpp
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/kdecore/kconfig_compiler/CMakeLists.txt b/kdecore/kconfig_compiler/CMakeLists.txt
index 314b381cc..d256d21c3 100644
--- a/kdecore/kconfig_compiler/CMakeLists.txt
+++ b/kdecore/kconfig_compiler/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
diff --git a/kdecore/network/CMakeLists.txt b/kdecore/network/CMakeLists.txt
index 2f1a19b58..e00fdd0c8 100644
--- a/kdecore/network/CMakeLists.txt
+++ b/kdecore/network/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}
diff --git a/kdecore/svgicons/CMakeLists.txt b/kdecore/svgicons/CMakeLists.txt
index 1b1d43659..714925667 100644
--- a/kdecore/svgicons/CMakeLists.txt
+++ b/kdecore/svgicons/CMakeLists.txt
@@ -9,10 +9,6 @@
 #
 #################################################
 
-add_definitions(
-  ${TQT_CFLAGS_OTHER}
-)
-
 include_directories(
   ${TQT_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/kdecore
-- 
cgit v1.2.1