[Cmake-commits] CMake branch, next, updated. v3.0.0-3913-ged74754

[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  ed74754641c29bd83a916fc84d5d46c79c41b885 (commit)
       via  a279641a5dbd234b45775757c1e025aa03a3281f (commit)
      from  a32ace703924fea5e4e78ae6d29cbcc245b2a04c (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=ed74754641c29bd83a916fc84d5d46c79c41b885
commit ed74754641c29bd83a916fc84d5d46c79c41b885
Merge: a32ace7 a279641
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Jun 25 10:39:27 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 10:39:27 2014 -0400

    Merge topic 'FindQt4-ignore-qt5' into next
    
    a279641a FindQt4: Don't further process qmake if it does not belong to Qt4


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a279641a5dbd234b45775757c1e025aa03a3281f
commit a279641a5dbd234b45775757c1e025aa03a3281f
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Jun 25 15:57:27 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Wed Jun 25 16:38:05 2014 +0200

    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.

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

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

Summary of changes:


hooks/post-receive
-- 
CMake