diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-27 22:03:55 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-03-27 22:03:55 +0000 |
| commit | 9edee94d160ac1050dc0252d2881c1f9b64d7325 (patch) | |
| tree | c98cc3b5eeccaf61b62a4ec354e1f39dd4909452 | |
| parent | 3b4cea3c9803bcaae3909f3c824ebc69453c9c72 (diff) | |
| download | tdepim-9edee94d160ac1050dc0252d2881c1f9b64d7325.tar.gz tdepim-9edee94d160ac1050dc0252d2881c1f9b64d7325.zip | |
arts, kdelibs, kdebase, kdepim: use new tqt build system
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1226236 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 66560a004..52e0eb639 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ # ################################################# -cmake_minimum_required( VERSION 2.6 ) +cmake_minimum_required( VERSION 2.8 ) ##### general package setup ##################### @@ -123,10 +123,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 8b39d8afb..f532c3642 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -105,6 +105,5 @@ if( BUILD_LIBKDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBOO endif( ) # required stuff -find_package( Qt ) find_package( TQt ) find_package( TDE ) |