[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1112-g9f476fd

[Alexander Neundorf]

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  9f476fd352f60a846f605bab00477e3711024de5 (commit)
       via  4809cadfe82316b648de50471169b4da9ef101e2 (commit)
       via  d5ac791366595be307896e9894c66815c1e1eb2f (commit)
      from  8fc1a2c2c412ea5a75e0bffc353f25c20f2b829a (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=9f476fd352f60a846f605bab00477e3711024de5
commit 9f476fd352f60a846f605bab00477e3711024de5
Merge: 8fc1a2c 4809cad
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Nov 29 03:23:52 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Nov 29 03:23:52 2012 -0500

    Merge topic 'MinorFixFPHSA_13755' into next
    
    4809cad FPHSA: don't succeed if only checking for XX_FOUND (#13755)
    d5ac791 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4809cadfe82316b648de50471169b4da9ef101e2
commit 4809cadfe82316b648de50471169b4da9ef101e2
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Nov 29 09:21:18 2012 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Nov 29 09:21:18 2012 +0100

    FPHSA: don't succeed if only checking for XX_FOUND (#13755)
    
    This fixes issue #13755.
    FPHSA(XX DEFAULT_MSG XX_FOUND)
    always succeeded due to the way how the XX_FOUND variable was set.
    It was preset to TRUE, and then reset to FALSE if something was missing
    (...which had the effect that XX_FOUND itself was already preset when FPHSA
    checked whether XX_FOUND is set)
    
    Now XX_FOUND is unset first, and only later on set to TRUE.
    
    Alex

diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index 5549d14..e89e9a9 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -187,8 +187,8 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   # user knows better what went wrong (#6375)
   set(MISSING_VARS "")
   set(DETAILS "")
-  set(${_NAME_UPPER}_FOUND TRUE)
   # check if all passed variables are valid
+  unset(${_NAME_UPPER}_FOUND)
   foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
     if(NOT ${_CURRENT_VAR})
       set(${_NAME_UPPER}_FOUND FALSE)
@@ -197,6 +197,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
       set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
     endif()
   endforeach()
+  if(NOT "${${_NAME_UPPER}_FOUND}" STREQUAL "FALSE")
+    set(${_NAME_UPPER}_FOUND TRUE)
+  endif()
 
   # component handling
   unset(FOUND_COMPONENTS_MSG)

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

Summary of changes:
 Modules/FindPackageHandleStandardArgs.cmake |    5 ++++-
 Source/CMakeVersion.cmake                   |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake