[Cmake-commits] CMake branch, next, updated. v3.0.0-3988-g2495516

[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  24955168c5d77590b91574fc23524329eaac9ebf (commit)
       via  567d4d8dc62f15b7e7c90cc72cc034aab2cd66af (commit)
      from  587d0e08aaee2a3ddd562dbe4b3cd7a95a130c4f (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=24955168c5d77590b91574fc23524329eaac9ebf
commit 24955168c5d77590b91574fc23524329eaac9ebf
Merge: 587d0e0 567d4d8
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Jun 27 10:26:43 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 27 10:26:43 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=567d4d8dc62f15b7e7c90cc72cc034aab2cd66af
commit 567d4d8dc62f15b7e7c90cc72cc034aab2cd66af
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Jun 25 15:57:27 2014 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Jun 27 16:24:40 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:
 Modules/FindQt4.cmake |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake