diff options
| author | Nils Gladitz <nilsgladitz@gmail.com> | 2014-06-25 13:57:27 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2014-06-27 14:24:40 (GMT) |
| commit | 567d4d8dc62f15b7e7c90cc72cc034aab2cd66af (patch) | |
| tree | edad8e6ddb67c05fd21dbc9b5b0900e0103c5c18 | |
| parent | feb44093bc1a5b503ef26fb633a58baeec144d0a (diff) | |
| download | CMake-567d4d8dc62f15b7e7c90cc72cc034aab2cd66af.zip CMake-567d4d8dc62f15b7e7c90cc72cc034aab2cd66af.tar.gz CMake-567d4d8dc62f15b7e7c90cc72cc034aab2cd66af.tar.bz2 | |
FindQt4: Don't further process qmake if it does not belong to Qt4
If the only qmake that can be found belongs to Qt5 the find module
would otherwise still further interrogate it and issue diagnostics
which are specific to Qt4.
| -rw-r--r-- | Modules/FindQt4.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index c930042..c942c1c 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -518,7 +518,8 @@ set(QT4_INSTALLED_VERSION_TOO_OLD FALSE) set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac) _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION) -if (QT_QMAKE_EXECUTABLE AND QTVERSION) +if (QT_QMAKE_EXECUTABLE AND + QTVERSION VERSION_GREATER 3 AND QTVERSION VERSION_LESS 5) if (Qt5Core_FOUND) # Qt5CoreConfig sets QT_MOC_EXECUTABLE as a non-cache variable to the Qt 5 |