[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2672-g2731226

[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  27312263cd68c815ae83cd01305783ccb71a5367 (commit)
       via  535e53c7ccbed7f7218caf3955dac93d40af0c38 (commit)
      from  46ec65d78df4b0baff5aca2d7a98b1205965c778 (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=27312263cd68c815ae83cd01305783ccb71a5367
commit 27312263cd68c815ae83cd01305783ccb71a5367
Merge: 46ec65d 535e53c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Mar 26 19:18:37 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 26 19:18:37 2013 -0400

    Merge topic 'fix-Qt5-incompatibility-check-version' into next
    
    535e53c Fix the Qt 5 version required to run the IncompatibleQt test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=535e53c7ccbed7f7218caf3955dac93d40af0c38
commit 535e53c7ccbed7f7218caf3955dac93d40af0c38
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 27 00:15:08 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 27 00:15:08 2013 +0100

    Fix the Qt 5 version required to run the IncompatibleQt test.
    
    The commit to add the INTERFACE_QT_MAJOR_VERSION in qtbase.git
    is 14054d45 (Set the INTERFACE_QT_MAJOR_VERSION to 5., 2013-03-16)
    which will be part of Qt 5.1.0.
    
    If there is a Qt 5.0.3 release, there is no guarantee it will
    contain that commit. Make sure such a Qt version does not fail
    with this test if not.

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 7f9b9fd..a3c9605 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -77,7 +77,7 @@ add_RunCMake_test(CMP0004)
 
 find_package(Qt4 QUIET)
 find_package(Qt5Core QUIET)
-if (QT4_FOUND AND Qt5Core_FOUND AND Qt5Core_VERSION VERSION_GREATER 5.0.2)
+if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
   add_RunCMake_test(IncompatibleQt)
 endif()
 

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

Summary of changes:
 Tests/RunCMake/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake