[Cmake-commits] CMake branch, next, updated. v3.1.0-2059-g017d7c3

[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  017d7c3c8c666fbb5c43c266e7af9957cf710f6e (commit)
       via  b937f7537943e56998f1f4630e3684ca7417442b (commit)
       via  6af8cbf214c7de6ef4bb036cb9f6c4bc147fd511 (commit)
       via  49d05a4713729d7531192ae16fc94511dac9b8ec (commit)
      from  3ec60de0889433dbbb526f8ff916588a188c5746 (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=017d7c3c8c666fbb5c43c266e7af9957cf710f6e
commit 017d7c3c8c666fbb5c43c266e7af9957cf710f6e
Merge: 3ec60de b937f75
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 16 16:06:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 16 16:06:40 2015 -0500

    Merge topic 'FindQt-fixes' into next
    
    b937f753 FindQt: explicitely mention that it cannot Qt5 or later
    6af8cbf2 FindQt: fix variable name in error message
    49d05a47 FindQt: fix setting DESIRED_QT_VERSION if "find_package(Qt VVV)" was called


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b937f7537943e56998f1f4630e3684ca7417442b
commit b937f7537943e56998f1f4630e3684ca7417442b
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:06:22 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=6af8cbf214c7de6ef4bb036cb9f6c4bc147fd511
commit 6af8cbf214c7de6ef4bb036cb9f6c4bc147fd511
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 16 20:59:12 2015 +0100
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Fri Jan 16 22:06:21 2015 +0100

    FindQt: fix variable name in error message

diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 19f1773..8014768 100644
--- a/Modules/FindQt.cmake
+++ b/Modules/FindQt.cmake
@@ -183,9 +183,9 @@ else()
   endif()
   if(NOT QT_FOUND AND DESIRED_QT_VERSION)
     if(QT_REQUIRED)
-      message(FATAL_ERROR "CMake was unable to find Qt version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE, if those are set then QT_QT_LIBRARY or QT_LIBRARY_DIR.")
+      message(FATAL_ERROR "CMake was unable to find Qt version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_H_FILE, if those are set then QT_QT_LIBRARY or QT_LIBRARY_DIR.")
     else()
-      message( "CMake was unable to find desired Qt version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_FILE.")
+      message( "CMake was unable to find desired Qt version: ${DESIRED_QT_VERSION}. Set advanced values QT_QMAKE_EXECUTABLE and QT${DESIRED_QT_VERSION}_QGLOBAL_H_FILE.")
     endif()
   endif()
 endif()

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

    FindQt: fix setting DESIRED_QT_VERSION if "find_package(Qt VVV)" was called
    
    In case the given version was not only "3" or "4", but something like "4.8"
    DESIRED_QT_VERSION was set to an unsupported value. While at it also check
    that the version passed in is really in the range of 3.x and 4.x. Also
    suggest switching to the more specific find modules if possible.

diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 1bc0940..19f1773 100644
--- a/Modules/FindQt.cmake
+++ b/Modules/FindQt.cmake
@@ -79,7 +79,11 @@ endif()
 set(GLOB_TEMP_VAR)
 
 if (Qt_FIND_VERSION)
-  set(DESIRED_QT_VERSION "${Qt_FIND_VERSION}")
+  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.")
+  endif ()
 endif ()
 
 # now find qmake

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

Summary of changes:


hooks/post-receive
-- 
CMake