[Cmake-commits] CMake branch, next, updated. v2.8.8-2803-gf87827d

[Stephen Kelly]

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  f87827d87a43380d2ea1684278f94e8bf54e7a39 (commit)
       via  1dfe15c4314c2b7ef6cb15a5deb274f73c3de3ce (commit)
      from  1c9ac268bd9907626cb1171474736dcccfe844b7 (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=f87827d87a43380d2ea1684278f94e8bf54e7a39
commit f87827d87a43380d2ea1684278f94e8bf54e7a39
Merge: 1c9ac26 1dfe15c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 3 10:49:46 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 3 10:49:46 2012 -0400

    Merge topic 'abort-findqt4-on-qt5' into next
    
    1dfe15c Abort FindQt4.cmake if Qt 5 is found.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1dfe15c4314c2b7ef6cb15a5deb274f73c3de3ce
commit 1dfe15c4314c2b7ef6cb15a5deb274f73c3de3ce
Author:     David Faure <faure at kde.org>
AuthorDate: Thu May 3 16:46:50 2012 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 3 16:47:07 2012 +0200

    Abort FindQt4.cmake if Qt 5 is found.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 9b646b4..e7cd02f 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1169,10 +1169,22 @@ ELSE( Qt4_FIND_COMPONENTS )
 
 ENDIF( Qt4_FIND_COMPONENTS )
 
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4
-  REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS}
-  VERSION_VAR QTVERSION
-  )
+if (${QT_VERSION_MAJOR} GREATER 4)
+    SET(VERSION_MSG "Found unsuitable Qt version \"${QTVERSION}\" from ${QT_QMAKE_EXECUTABLE}")
+    SET(QT4_FOUND FALSE)
+    IF(Qt4_FIND_REQUIRED)
+       MESSAGE( FATAL_ERROR "${VERSION_MSG}, this code requires Qt 4.x")
+    ELSE(Qt4_FIND_REQUIRED)
+      IF(NOT Qt4_FIND_QUIETLY)
+         MESSAGE( STATUS    "${VERSION_MSG}")
+      ENDIF(NOT Qt4_FIND_QUIETLY)
+    ENDIF(Qt4_FIND_REQUIRED)
+else()
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4
+    REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS}
+    VERSION_VAR QTVERSION
+    )
+endif()
 
 #######################################
 #

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

Summary of changes:
 Modules/FindQt4.cmake |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake