[Cmake-commits] CMake branch, next, updated. v3.2.2-1852-g0507608

Brad King brad.king at kitware.com
Thu Apr 16 09:57:18 EDT 2015


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  05076086e95ccddba5767ff3417faf567390bf70 (commit)
       via  f0c5444349c6702cca12c254125e4d347c19d32c (commit)
      from  57ef5b971e1b05343af7e4c4c41e6aa4baad21dd (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=05076086e95ccddba5767ff3417faf567390bf70
commit 05076086e95ccddba5767ff3417faf567390bf70
Merge: 57ef5b9 f0c5444
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 16 09:57:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 16 09:57:18 2015 -0400

    Merge topic 'FPHSA-updates' into next
    
    f0c54443 fixup! FPHSA: Always populate the ExactCase_FOUND variable (#15412).


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0c5444349c6702cca12c254125e4d347c19d32c
commit f0c5444349c6702cca12c254125e4d347c19d32c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 16 09:56:00 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 16 09:56:00 2015 -0400

    fixup! FPHSA: Always populate the ExactCase_FOUND variable (#15412).

diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
index 6fdc917..1be38af 100644
--- a/Modules/FindPackageHandleStandardArgs.cmake
+++ b/Modules/FindPackageHandleStandardArgs.cmake
@@ -249,18 +249,21 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
   set(MISSING_VARS "")
   set(DETAILS "")
   # check if all passed variables are valid
-  unset(${_NAME}_FOUND)
-  unset(${_NAME_UPPER}_FOUND)
+  set(FPHSA_FOUND_${_NAME} TRUE)
   foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
     if(NOT ${_CURRENT_VAR})
-      set(${_NAME}_FOUND FALSE)
+      set(FPHSA_FOUND_${_NAME} FALSE)
       set(MISSING_VARS "${MISSING_VARS} ${_CURRENT_VAR}")
     else()
       set(DETAILS "${DETAILS}[${${_CURRENT_VAR}}]")
     endif()
   endforeach()
-  if(NOT "${${_NAME}_FOUND}" STREQUAL "FALSE")
+  if(FPHSA_FOUND_${_NAME})
     set(${_NAME}_FOUND TRUE)
+    set(${_NAME_UPPER}_FOUND TRUE)
+  else()
+    set(${_NAME}_FOUND FALSE)
+    set(${_NAME_UPPER}_FOUND FALSE)
   endif()
 
   # component handling

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

Summary of changes:
 Modules/FindPackageHandleStandardArgs.cmake |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list