diff options
| author | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-10 22:58:53 +0000 |
|---|---|---|
| committer | samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-01-10 22:58:53 +0000 |
| commit | a4caa4c79653d13faa5f362a4179a9f0e77a19e0 (patch) | |
| tree | 3768f05d36c075a3c54ac0c39ebb5a9d2310132a | |
| parent | ce1a03a49ad5a3845d22c2e36cb463fed03eb38d (diff) | |
| download | other-a4caa4c7.tar.gz other-a4caa4c7.zip | |
[kde-common/cmake] FindQt.cmake: checking for patched Qt; added more flags to QT_DEFINITIONS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kde-common@1213590 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
| -rw-r--r-- | cmake/modules/FindQt.cmake | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake index dd3490d..491a2fc 100644 --- a/cmake/modules/FindQt.cmake +++ b/cmake/modules/FindQt.cmake @@ -84,9 +84,23 @@ if( NOT QT_FOUND ) endif( NOT QT_LIBRARY_DIRS ) - message( STATUS " found Qt, version ${__version}" ) + # check if Qt3 is patched for compatibility with TQt + tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + set( CMAKE_REQUIRED_INCLUDES ${QT_INCLUDE_DIRS} ) + set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIRS} qt-mt ) + check_cxx_source_compiles(" + #include <qobjectlist.h> + #include <qobject.h> + int main(int, char**) { QObject::objectTreesListObject(); return 0; } " + HAVE_PATCHED_QT3 ) + tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + if( NOT HAVE_PATCHED_QT3 ) + tde_message_fatal( "Your Qt3 is not patched for compatibility with tqtinterface" ) + endif() + + message( STATUS " found patched Qt, version ${__version}" ) set( QT_FOUND true CACHE INTERNAL QT_FOUND FORCE ) set( QT_LIBRARIES "qt-mt" CACHE INTERNAL QT_LIBRARIES FORCE ) - set( QT_DEFINITIONS "-DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION" CACHE INTERNAL QT_DEFINITIONS FORCE ) + set( QT_DEFINITIONS "-DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_COMPAT -DQT_NO_TRANSLATION -DQT_THREAD_SUPPORT -D_REENTRANT" CACHE INTERNAL QT_DEFINITIONS FORCE ) endif( NOT QT_FOUND ) |