diff options
| author | David Cole <david.cole@kitware.com> | 2012-05-08 18:32:53 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-05-08 18:32:53 (GMT) |
| commit | 105dfc38be7fefab3d855f949fed48982b18809e (patch) | |
| tree | 19313fd832d85ad60e5532c2927029caa330fb29 | |
| parent | fb337c66b84102693576740ae9753f012b241037 (diff) | |
| parent | 37a28ffa364b397082aa07cf69b32cf8980e1447 (diff) | |
| download | CMake-105dfc38be7fefab3d855f949fed48982b18809e.zip CMake-105dfc38be7fefab3d855f949fed48982b18809e.tar.gz CMake-105dfc38be7fefab3d855f949fed48982b18809e.tar.bz2 | |
Merge topic 'abort-findqt4-on-qt5'
37a28ff Fix the number variable comparison when Qt is not found.
1dfe15c Abort FindQt4.cmake if Qt 5 is found.
| -rw-r--r-- | Modules/FindQt4.cmake | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 9b646b4..f9db5e1 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -1169,10 +1169,22 @@ ELSE( Qt4_FIND_COMPONENTS ) ENDIF( Qt4_FIND_COMPONENTS ) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4 - REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS} - VERSION_VAR QTVERSION - ) +if (QT_VERSION_MAJOR GREATER 4) + SET(VERSION_MSG "Found unsuitable Qt version \"${QTVERSION}\" from ${QT_QMAKE_EXECUTABLE}") + SET(QT4_FOUND FALSE) + IF(Qt4_FIND_REQUIRED) + MESSAGE( FATAL_ERROR "${VERSION_MSG}, this code requires Qt 4.x") + ELSE(Qt4_FIND_REQUIRED) + IF(NOT Qt4_FIND_QUIETLY) + MESSAGE( STATUS "${VERSION_MSG}") + ENDIF(NOT Qt4_FIND_QUIETLY) + ENDIF(Qt4_FIND_REQUIRED) +else() + FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4 + REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS} + VERSION_VAR QTVERSION + ) +endif() ####################################### # |