[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2555-g6783335

[Brad King]

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  6783335eb78d8579aec0f2a3268ad49a4961a7c7 (commit)
       via  28d14f9f139cb6473cc819b69372b7eb9795bffd (commit)
      from  c448ad8f3c6ed692359df8c74222d8cad3be9133 (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=6783335eb78d8579aec0f2a3268ad49a4961a7c7
commit 6783335eb78d8579aec0f2a3268ad49a4961a7c7
Merge: c448ad8 28d14f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 18 09:31:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 18 09:31:32 2013 -0400

    Merge topic 'set-Qt4_FOUND' into next
    
    28d14f9 FindQt4: Set the Qt4_FOUND variable if Qt4 is found


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28d14f9f139cb6473cc819b69372b7eb9795bffd
commit 28d14f9f139cb6473cc819b69372b7eb9795bffd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 16 18:42:14 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 18 09:30:47 2013 -0400

    FindQt4: Set the Qt4_FOUND variable if Qt4 is found
    
    Provide the old QT4_FOUND for compatibility.

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:


hooks/post-receive
-- 
CMake