diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-18 15:37:09 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-18 15:37:09 -0600 |
| commit | 3499ae8f99378d91006e505a9bac53b82968ee1b (patch) | |
| tree | 10443004718d847c66db535b2d09863c5d6fb231 | |
| parent | 0d688e3383b6ec087c0c4bd709ee86e22557686c (diff) | |
| download | tqtinterface-3499ae8f99378d91006e505a9bac53b82968ee1b.tar.gz tqtinterface-3499ae8f99378d91006e505a9bac53b82968ee1b.zip | |
Detect native tqt3 in a reliable manner
This closes Bug 816
| -rw-r--r-- | ConfigureChecks.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 0f320c2..76579fa 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -50,7 +50,6 @@ if( NOT DEFINED QT_INCLUDE_DIR ) if( QT_PREFIX_DIR STREQUAL "/usr" ) if( EXISTS "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" ) set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/tqt${QT_VERSION}" ) - set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" ) else( ) set( QT_INCLUDE_DIR "${QT_PREFIX_DIR}/include/qt${QT_VERSION}" ) endif( ) @@ -60,6 +59,13 @@ if( NOT DEFINED QT_INCLUDE_DIR ) endif( ) qt_message( " QT_INCLUDE_DIR: ${QT_INCLUDE_DIR}" ) +# detect native tqt +if( EXISTS "${QT_INCLUDE_DIR}/ntqglobal.h" ) + set( HAVE_REAL_TQT ON CACHE BOOL "Native TQt3 detected" ) + qt_message( "Native TQt3 detected" ) +else( ) + qt_message( "Qt3 detected" ) +endif( ) # qt library path if( NOT DEFINED QT_LIBRARY_DIR ) |