[Cmake-commits] CMake branch, next, updated. v3.1.0-2055-g3ec60de

[Rolf Eike Beer]

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  3ec60de0889433dbbb526f8ff916588a188c5746 (commit)
       via  c74d1e84a8070c8d0220d3a5eec2df20b0d02af8 (commit)
       via  990b063d7ccec6e912acd951f4cbca70d31548e1 (commit)
      from  109d9a8cd63f604fcf0e668c6e3c2426c74ae5da (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=3ec60de0889433dbbb526f8ff916588a188c5746
commit 3ec60de0889433dbbb526f8ff916588a188c5746
Merge: 109d9a8 c74d1e8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 16 16:06:04 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 16 16:06:04 2015 -0500

    Merge topic 'FindQt-fixes' into next
    
    c74d1e84 FindQt: explicitely mention that it cannot Qt5 or later
    990b063d FindQt-fixup


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c74d1e84a8070c8d0220d3a5eec2df20b0d02af8
commit c74d1e84a8070c8d0220d3a5eec2df20b0d02af8
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 16 22:04:29 2015 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 16 22:04:29 2015 +0100

    FindQt: explicitely mention that it cannot Qt5 or later

diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 8014768..41b7271 100644
--- a/Modules/FindQt.cmake
+++ b/Modules/FindQt.cmake
@@ -13,6 +13,9 @@
 # or FindQt4 module is included.  Once the user sets DESIRED_QT_VERSION,
 # then the FindQt3 or FindQt4 module is included.
 #
+# This module can only detect and switch between Qt versions 3 and 4. It
+# cannot handle Qt5 or any later versions.
+#
 # ::
 #
 #   QT_REQUIRED if this is set to TRUE then if CMake can

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=990b063d7ccec6e912acd951f4cbca70d31548e1
commit 990b063d7ccec6e912acd951f4cbca70d31548e1
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 16 22:03:21 2015 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 16 22:03:21 2015 +0100

    FindQt-fixup

diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 9921a38..8014768 100644
--- a/Modules/FindQt.cmake
+++ b/Modules/FindQt.cmake
@@ -79,7 +79,7 @@ endif()
 set(GLOB_TEMP_VAR)
 
 if (Qt_FIND_VERSION)
-  if (Qt_FIND_VERSION MATCHES "^([34])(\\.[0-9]+.*)$")
+  if (Qt_FIND_VERSION MATCHES "^([34])(\\.[0-9]+.*)?$")
     set(DESIRED_QT_VERSION ${CMAKE_MATCH_1})
   else ()
     message(FATAL_ERROR "FindQt was called with invalid version '${Qt_FIND_VERSION}'. Only Qt major versions 3 or 4 are supported. If you do not need to support both Qt3 and Qt4 in your source consider calling find_package(Qt3) or find_package(Qt4) instead of find_package(Qt) instead.")

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

Summary of changes:
 Modules/FindQt.cmake |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake