[Cmake-commits] CMake branch, next, updated. v3.0.0-3907-g9321c61

[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  9321c6164de7ca25277347dbcfddcee652765e66 (commit)
       via  903da92e13c69ed4e2c8dbc57e2207c89c6f9d89 (commit)
       via  6c383f89a1c773de631707c80396ef06cd650bdc (commit)
      from  f185f975ffd13411c4c666f1531f8675d2c4a8c1 (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=9321c6164de7ca25277347dbcfddcee652765e66
commit 9321c6164de7ca25277347dbcfddcee652765e66
Merge: f185f97 903da92
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Wed Jun 25 10:05:48 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 25 10:05:48 2014 -0400

    Merge topic 'FindQt4-ignore-qt5' into next
    
    903da92e FindQt4: Don't further process qmake if it belongs to Qt 5.x
    6c383f89 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=903da92e13c69ed4e2c8dbc57e2207c89c6f9d89
commit 903da92e13c69ed4e2c8dbc57e2207c89c6f9d89
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 15:57:27 2014 +0200

    FindQt4: Don't further process qmake if it belongs to Qt 5.x
    
    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..7368541 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -518,7 +518,7 @@ 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_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     |    2 +-
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake