[Cmake-commits] CMake branch, next, updated. v3.0.0-3911-ga32ace7

[Nils Gladitz]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a32ace703924fea5e4e78ae6d29cbcc245b2a04c (commit)
       via  f7d4e0ce389f2b39b6decad02708551cbcdf2dda (commit)
      from  b73a9e3334942321f6b79b0bb885d82cd0bdf70a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a32ace703924fea5e4e78ae6d29cbcc245b2a04c
commit a32ace703924fea5e4e78ae6d29cbcc245b2a04c
Merge: b73a9e3 f7d4e0c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Jun 25 10:36:39 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 10:36:39 2014 -0400

    Merge topic 'FindQt4-ignore-qt5' into next
    
    f7d4e0ce FindQt4: Check the lower bound to exclude Qt3 as well


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7d4e0ce389f2b39b6decad02708551cbcdf2dda
commit f7d4e0ce389f2b39b6decad02708551cbcdf2dda
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Jun 25 16:35:59 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Jun 25 16:35:59 2014 +0200

    FindQt4: Check the lower bound to exclude Qt3 as well

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 7368541..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 VERSION_LESS 5)
+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

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindQt4.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake