summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-03-27 22:03:55 +0000
committersamelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-03-27 22:03:55 +0000
commit01c1a203c427b44c7578fd4af470577fc95a8745 (patch)
tree4d597832573ed721a23b7a62c7b836294fd20237
parentda5ce65b6bd031f66c32a0ee5124818af5c626da (diff)
downloadtdebase-01c1a203c427b44c7578fd4af470577fc95a8745.tar.gz
tdebase-01c1a203c427b44c7578fd4af470577fc95a8745.zip
arts, kdelibs, kdebase, kdepim: use new tqt build system
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1226236 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--CMakeLists.txt5
-rw-r--r--ConfigureChecks.cmake1
2 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index edf5372dd..559ee8cc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@
#
#################################################
-cmake_minimum_required( VERSION 2.6 )
+cmake_minimum_required( VERSION 2.8 )
##### general package setup #####################
@@ -126,10 +126,9 @@ include( ConfigureChecks.cmake )
add_definitions(
-DHAVE_CONFIG_H
- ${TQT_CFLAGS_OTHER}
)
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include tqt.h" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index d884faa4c..c85d32a32 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -144,7 +144,6 @@ endif( )
# required stuff
-find_package( Qt )
find_package( TQt )
find_package( TDE )