diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-08 16:31:23 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-08 16:31:23 -0600 |
| commit | 6351ace5b1923516f683adcc27488af6b23f3785 (patch) | |
| tree | b768e4aacaf3c9fb21d384d1e9e7b06890b7c725 /ConfigureChecks.cmake | |
| parent | d27878829fed305ba79ad65a748bc9a7e0b1843b (diff) | |
| download | tqtinterface-6351ace5b1923516f683adcc27488af6b23f3785.tar.gz tqtinterface-6351ace5b1923516f683adcc27488af6b23f3785.zip | |
Fix native TQt3 detection
Fix header file #ifdef collisions
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 514020d..1ce5c9b 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -160,6 +160,18 @@ if( QT_VERSION STREQUAL "3" ) #include <qapplication.h> int main(int argc, char **argv) { QApplication app(argc, argv); return 0; } " HAVE_USABLE_QT${QT_VERSION} ) + if( NOT HAVE_USABLE_QT${QT_VERSION} ) + # Unset the Qt detection variable + unset( HAVE_USABLE_QT${QT_VERSION} CACHE ) + # Reset libraries + set( QT_LIBRARIES tqt-mt ) + set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIR} ${QT_LIBRARIES} ) + qt_message( "Looking for native TQt3..." ) + check_cxx_source_compiles(" + #include <qapplication.h> + int main(int argc, char **argv) { TQApplication app(argc, argv); return 0; } " + HAVE_USABLE_QT${QT_VERSION} ) + endif( ) # check if Qt4 is usable elseif( QT_VERSION STREQUAL "4" ) check_cxx_source_compiles(" @@ -178,6 +190,19 @@ if( QT_VERSION STREQUAL "3" ) #include <qobject.h> int main(int, char**) { QObject::objectTreesListObject(); return 0; } " HAVE_PATCHED_QT3 ) + if( NOT HAVE_PATCHED_QT3 ) + # Unset the Qt detection variable + unset( HAVE_PATCHED_QT3 CACHE ) + # Reset libraries + set( QT_LIBRARIES tqt-mt ) + set( CMAKE_REQUIRED_LIBRARIES -L${QT_LIBRARY_DIR} ${QT_LIBRARIES} ) + qt_message( "Looking for patched native TQt3..." ) + check_cxx_source_compiles(" + #include <qobjectlist.h> + #include <qobject.h> + int main(int, char**) { TQObject::objectTreesListObject(); return 0; } " + HAVE_PATCHED_QT3 ) + endif( ) if( NOT HAVE_PATCHED_QT3 ) tde_message_fatal( "Your Qt3 is not patched for compatibility with tqtinterface." ) endif( ) |