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 /kstyles | |
| 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 'kstyles')
| -rw-r--r-- | kstyles/highcolor/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kstyles/highcontrast/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kstyles/highcontrast/config/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kstyles/keramik/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | kstyles/kthemestyle/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | kstyles/light/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kstyles/plastik/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kstyles/plastik/config/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | kstyles/utils/installtheme/CMakeLists.txt | 4 |
9 files changed, 2 insertions, 20 deletions
diff --git a/kstyles/highcolor/CMakeLists.txt b/kstyles/highcolor/CMakeLists.txt index 309f0f44e..fb923ce51 100644 --- a/kstyles/highcolor/CMakeLists.txt +++ b/kstyles/highcolor/CMakeLists.txt @@ -10,7 +10,6 @@ ################################################# add_definitions( - ${TQT_CFLAGS_OTHER} -DQT_PLUGIN ) diff --git a/kstyles/highcontrast/CMakeLists.txt b/kstyles/highcontrast/CMakeLists.txt index ca2f998fc..d3dc224bb 100644 --- a/kstyles/highcontrast/CMakeLists.txt +++ b/kstyles/highcontrast/CMakeLists.txt @@ -13,7 +13,6 @@ add_subdirectory( config ) add_definitions( - ${TQT_CFLAGS_OTHER} -DQT_PLUGIN ) diff --git a/kstyles/highcontrast/config/CMakeLists.txt b/kstyles/highcontrast/config/CMakeLists.txt index 8c634688f..cd575ff3e 100644 --- a/kstyles/highcontrast/config/CMakeLists.txt +++ b/kstyles/highcontrast/config/CMakeLists.txt @@ -9,10 +9,6 @@ # ################################################# -add_definitions( - ${TQT_CFLAGS_OTHER} -) - include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/kstyles/keramik/CMakeLists.txt b/kstyles/keramik/CMakeLists.txt index 61776a98d..5862a8653 100644 --- a/kstyles/keramik/CMakeLists.txt +++ b/kstyles/keramik/CMakeLists.txt @@ -10,7 +10,6 @@ ################################################# add_definitions( - ${TQT_CFLAGS_OTHER} -UQT_NO_ASCII_CAST -DQT_PLUGIN ) @@ -66,6 +65,6 @@ set_source_files_properties( pixmaploader.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_ tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared + LINK kdefx-shared Xext DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/kthemestyle/CMakeLists.txt b/kstyles/kthemestyle/CMakeLists.txt index 94277030f..45bdb0b68 100644 --- a/kstyles/kthemestyle/CMakeLists.txt +++ b/kstyles/kthemestyle/CMakeLists.txt @@ -10,7 +10,6 @@ ################################################# add_definitions( - ${TQT_CFLAGS_OTHER} -DQT_PLUGIN ) @@ -37,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdefx-shared kdecore-shared + LINK kdefx-shared kdecore-shared dl DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/kstyles/light/CMakeLists.txt b/kstyles/light/CMakeLists.txt index 1da874a17..7a0ee6610 100644 --- a/kstyles/light/CMakeLists.txt +++ b/kstyles/light/CMakeLists.txt @@ -10,7 +10,6 @@ ################################################# add_definitions( - ${TQT_CFLAGS_OTHER} -DQT_PLUGIN ) diff --git a/kstyles/plastik/CMakeLists.txt b/kstyles/plastik/CMakeLists.txt index d8694654c..a57af7c1f 100644 --- a/kstyles/plastik/CMakeLists.txt +++ b/kstyles/plastik/CMakeLists.txt @@ -12,7 +12,6 @@ add_subdirectory( config ) add_definitions( - ${TQT_CFLAGS_OTHER} -DQT_PLUGIN ) diff --git a/kstyles/plastik/config/CMakeLists.txt b/kstyles/plastik/config/CMakeLists.txt index 89da74a16..13eb35234 100644 --- a/kstyles/plastik/config/CMakeLists.txt +++ b/kstyles/plastik/config/CMakeLists.txt @@ -9,10 +9,6 @@ # ################################################# -add_definitions( - ${TQT_CFLAGS_OTHER} -) - include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/kstyles/utils/installtheme/CMakeLists.txt b/kstyles/utils/installtheme/CMakeLists.txt index 86fa42c99..8becda904 100644 --- a/kstyles/utils/installtheme/CMakeLists.txt +++ b/kstyles/utils/installtheme/CMakeLists.txt @@ -9,10 +9,6 @@ # ################################################# -add_definitions( - ${TQT_CFLAGS_OTHER} -) - include_directories( ${TQT_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/kdecore |