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
commit773c9d65d4fad0c630e826c22e15fe8891dd9e0b (patch)
tree9e4962fc633aac947351f66edbe3d5fe6c7ee123
parent87b276f234c7c52350235d45a43e072b0ef8655d (diff)
downloadtdelibs-773c9d65d4fad0c630e826c22e15fe8891dd9e0b.tar.gz
tdelibs-773c9d65d4fad0c630e826c22e15fe8891dd9e0b.zip
arts, kdelibs, kdebase, kdepim: use new tqt build system
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1226236 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--CMakeLists.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index de3701575..e2f5da07e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
#################################################
#
-# (C) 2010 Serghei Amelian
+# (C) 2010-2011 Serghei Amelian
# serghei (DOT) amelian (AT) gmail.com
#
# Improvements and feedback are welcome
@@ -9,7 +9,7 @@
#
#################################################
-cmake_minimum_required( VERSION 2.6 )
+cmake_minimum_required( VERSION 2.8 )
##### general package setup #####################
@@ -43,7 +43,6 @@ include( TDESetupPaths )
##### setup and find essential stuff ############
tde_setup_paths( )
-find_package( Qt )
find_package( TQt )
@@ -768,10 +767,9 @@ set( KDE3_KCFGC_EXECUTABLE ${CMAKE_BINARY_DIR}/kdecore/kconfig_compiler/kconfig_
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" )