[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2531-g10d45f2

[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  10d45f2091fd33701d27eaa869f6232783169d7e (commit)
       via  60dccacb8231eb52abb403f8c0ba77191806217e (commit)
       via  03b0ceebe5f8ca27b54a2d09ad38fb89c298f800 (commit)
      from  97fba40e31ef055d054cd4f30f2c138eb500e859 (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=10d45f2091fd33701d27eaa869f6232783169d7e
commit 10d45f2091fd33701d27eaa869f6232783169d7e
Merge: 97fba40 60dccac
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 16 13:48:07 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 16 13:48:07 2013 -0400

    Merge topic 'set-Qt4_FOUND' into next
    
    60dccac Set the Qt4_FOUND variable if Qt4 is found.
    03b0cee CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=60dccacb8231eb52abb403f8c0ba77191806217e
commit 60dccacb8231eb52abb403f8c0ba77191806217e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 16 18:42:14 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Mar 16 18:47:26 2013 +0100

    Set the Qt4_FOUND variable if Qt4 is found.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 1dd2782..b62e902 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -187,7 +187,8 @@
 #
 #  Below is a detailed list of variables that FindQt4.cmake sets.
 #  QT_FOUND         If false, don't try to use Qt.
-#  QT4_FOUND        If false, don't try to use Qt 4.
+#  Qt4_FOUND        If false, don't try to use Qt 4.
+#  QT4_FOUND        If false, don't try to use Qt 4. This variable is for compatibility only.
 #
 #  QT_VERSION_MAJOR The major version of Qt found.
 #  QT_VERSION_MINOR The minor version of Qt found.
@@ -1358,7 +1359,7 @@ if (NOT QT_VERSION_MAJOR EQUAL 4)
       endif()
     endif()
 else()
-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Qt4 FOUND_VAR Qt4_FOUND
     REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS}
     VERSION_VAR QTVERSION
     )
@@ -1373,5 +1374,6 @@ endif()
 set (QT_MOC_EXE ${QT_MOC_EXECUTABLE} )
 set (QT_UIC_EXE ${QT_UIC_EXECUTABLE} )
 set( QT_QT_LIBRARY "")
-set(QT_FOUND ${QT4_FOUND})
+set(QT4_FOUND ${Qt4_FOUND})
+set(QT_FOUND ${Qt4_FOUND})
 

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

Summary of changes:
 Modules/FindQt4.cmake     |    8 +++++---
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake