[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2559-g317fe71

[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  317fe7187a6f651695c1c79a375b43a1ff9d25d0 (commit)
       via  78e6217f314f22fa531261ee16b519a0dd751def (commit)
      from  5487336db6f4126293d7cc7d7438c78fe6c65d52 (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=317fe7187a6f651695c1c79a375b43a1ff9d25d0
commit 317fe7187a6f651695c1c79a375b43a1ff9d25d0
Merge: 5487336 78e6217
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 18 09:36:57 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 18 09:36:57 2013 -0400

    Merge topic 'fix-FPHSA-match' into next
    
    78e6217 FPHSA: Fix FOUND_VAR check to work with if() auto-dereference


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

    FPHSA: Fix FOUND_VAR check to work with if() auto-dereference
    
    Otherwise, it seems to match on the content of the variable.

diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index 5f92a86..70423a7 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -195,7 +195,7 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   string(TOLOWER ${_NAME} _NAME_LOWER)
 
   if(FPHSA_FOUND_VAR)
-    if("${FPHSA_FOUND_VAR}" MATCHES "^${_NAME}_FOUND$"  OR  "${FPHSA_FOUND_VAR}" MATCHES "^${_NAME_UPPER}_FOUND$")
+    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
       set(_FOUND_VAR ${FPHSA_FOUND_VAR})
     else()
       message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")

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

Summary of changes:


hooks/post-receive
-- 
CMake