diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-30 18:50:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-30 18:50:37 (GMT) |
| commit | 1a575a91d22d5ae5f3b8f73ad67f478ece3f9565 (patch) | |
| tree | 7d059c34dd03e1fe7a851b82d4312f122d1f39f4 /Modules | |
| parent | 1563668fd0020ee1e2a59b97827468777e3b7955 (diff) | |
| parent | 567d4d8dc62f15b7e7c90cc72cc034aab2cd66af (diff) | |
| download | CMake-1a575a91d22d5ae5f3b8f73ad67f478ece3f9565.zip CMake-1a575a91d22d5ae5f3b8f73ad67f478ece3f9565.tar.gz CMake-1a575a91d22d5ae5f3b8f73ad67f478ece3f9565.tar.bz2 | |
Merge topic 'FindQt4-ignore-qt5'
567d4d8d FindQt4: Don't further process qmake if it does not belong to Qt4
Diffstat (limited to 'Modules')
| -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 |