diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-11 16:43:23 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-11 16:43:23 +0000 |
| commit | 0ba4e3c0a468d0ce3d64c4062a39e8a792b29b93 (patch) | |
| tree | 2345621c7578cf29abe594a39c486409f01a7281 /dcop | |
| parent | 10308be19ef7fa44699562cc75946e7ea1fdf6b9 (diff) | |
| download | tdelibs-0ba4e3c0a468d0ce3d64c4062a39e8a792b29b93.tar.gz tdelibs-0ba4e3c0a468d0ce3d64c4062a39e8a792b29b93.zip | |
[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
Diffstat (limited to 'dcop')
| -rw-r--r-- | dcop/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | dcop/KDE-ICE/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | dcop/client/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | dcop/dcopidl/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | dcop/dcopidl2cpp/CMakeLists.txt | 4 |
5 files changed, 3 insertions, 20 deletions
diff --git a/dcop/CMakeLists.txt b/dcop/CMakeLists.txt index 56c3d3911..8854ba88a 100644 --- a/dcop/CMakeLists.txt +++ b/dcop/CMakeLists.txt @@ -15,13 +15,6 @@ add_subdirectory( dcopidlng ) add_subdirectory( dcopidl2cpp ) add_subdirectory( client ) - -include( KDE3Macros ) - -add_definitions( - ${TQT_CFLAGS_OTHER} -) - include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/dcop/KDE-ICE/CMakeLists.txt b/dcop/KDE-ICE/CMakeLists.txt index 17e2dab86..6963d5017 100644 --- a/dcop/KDE-ICE/CMakeLists.txt +++ b/dcop/KDE-ICE/CMakeLists.txt @@ -9,6 +9,8 @@ # ################################################# +set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include tqt.h" ) + add_definitions( -DICE_t -DTRANS_SERVER @@ -20,6 +22,7 @@ add_definitions( include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/dcop + ${TQT_INCLUDE_DIRS} ) diff --git a/dcop/client/CMakeLists.txt b/dcop/client/CMakeLists.txt index 3ed31360c..760746f9a 100644 --- a/dcop/client/CMakeLists.txt +++ b/dcop/client/CMakeLists.txt @@ -9,10 +9,6 @@ # ################################################# -add_definitions( - ${TQT_CFLAGS_OTHER} -) - include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} diff --git a/dcop/dcopidl/CMakeLists.txt b/dcop/dcopidl/CMakeLists.txt index ec2752bc0..f3a8c5049 100644 --- a/dcop/dcopidl/CMakeLists.txt +++ b/dcop/dcopidl/CMakeLists.txt @@ -9,11 +9,6 @@ # ################################################# -add_definitions( - ${TQT_CFLAGS_OTHER} - -include tqt.h -) - include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR} diff --git a/dcop/dcopidl2cpp/CMakeLists.txt b/dcop/dcopidl2cpp/CMakeLists.txt index 4b0f7d97c..6b2eea5f8 100644 --- a/dcop/dcopidl2cpp/CMakeLists.txt +++ b/dcop/dcopidl2cpp/CMakeLists.txt @@ -9,10 +9,6 @@ # ################################################# -add_definitions( - ${TQT_CFLAGS_OTHER} -) - include_directories( ${TQT_INCLUDE_DIRS} ) |