[Cmake-commits] CMake branch, next, updated. v3.1.0-2050-ga54d83b

[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  a54d83b3219f774e1382ba038e411b2268ec572e (commit)
       via  889c683b0315728adb5de3c622863b2111d6f99b (commit)
       via  8a742485fd29c0db0c0eb975fde6116c8b1e3756 (commit)
      from  b2b55d49dcd0474b12bdc175d1852301440935c5 (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=a54d83b3219f774e1382ba038e411b2268ec572e
commit a54d83b3219f774e1382ba038e411b2268ec572e
Merge: b2b55d4 889c683
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Fri Jan 16 15:44:56 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 16 15:44:56 2015 -0500

    Merge topic 'FindQt-fixes' into next
    
    889c683b FindQt: fix variable name in error message
    8a742485 FindQt: fix setting DESIRED_QT_VERSION if "find_package(Qt VVV)" was called


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=889c683b0315728adb5de3c622863b2111d6f99b
commit 889c683b0315728adb5de3c622863b2111d6f99b
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 21:44:40 2015 +0100

    FindQt: fix variable name in error message

diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 9d99581..9921a38 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=8a742485fd29c0db0c0eb975fde6116c8b1e3756
commit 8a742485fd29c0db0c0eb975fde6116c8b1e3756
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 21:44:39 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..9d99581 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:
 Modules/FindQt.cmake |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake