[Cmake-commits] CMake branch, next, updated. v3.5.2-850-gaac033f

[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  aac033f37386fbb263279cbe76349d69697b671d (commit)
       via  f11243d13e104e61949c7023ada5a9e74d653e5c (commit)
      from  b60e7becd4273f15895b34c63b7ff8ff9dda27c6 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aac033f37386fbb263279cbe76349d69697b671d
commit aac033f37386fbb263279cbe76349d69697b671d
Merge: b60e7be f11243d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 2 14:55:14 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 2 14:55:14 2016 -0400

    Merge topic 'FindHDF5-fix-already-found' into next
    
    f11243d1 FindHDF5: Add backwards compatability for already-found searches


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f11243d13e104e61949c7023ada5a9e74d653e5c
commit f11243d13e104e61949c7023ada5a9e74d653e5c
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Thu Jun 2 14:46:32 2016 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Thu Jun 2 14:46:32 2016 -0400

    FindHDF5: Add backwards compatability for already-found searches

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index f589977..bc0d50b 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -345,7 +345,7 @@ macro( _HDF5_parse_compile_line
 endmacro()
 
 # Try to find HDF5 using an installed hdf5-config.cmake
-if(NOT HDF5_ROOT AND NOT HDF5_FOUND)
+if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
     find_package(HDF5 QUIET NO_MODULE)
     if( HDF5_FOUND)
         set(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR})
@@ -382,7 +382,7 @@ if(NOT HDF5_ROOT AND NOT HDF5_FOUND)
     endif()
 endif()
 
-if(NOT HDF5_ROOT AND NOT HDF5_FOUND)
+if(NOT HDF5_FOUND AND NOT HDF5_ROOT)
   set(_HDF5_NEED_TO_SEARCH False)
   set(HDF5_COMPILER_NO_INTERROGATE True)
   # Only search for languages we've enabled
@@ -488,12 +488,12 @@ else()
   set(_HDF5_NEED_TO_SEARCH True)
 endif()
 
-if(HDF5_COMPILER_NO_INTERROGATE)
+if(NOT HDF5_FOUND AND HDF5_COMPILER_NO_INTERROGATE)
   # No arguments necessary, all languages can use the compiler wrappers
   set(HDF5_FOUND True)
   set(HDF5_METHOD "Included by compiler wrappers")
   set(HDF5_REQUIRED_VARS HDF5_METHOD)
-elseif(NOT _HDF5_NEED_TO_SEARCH)
+elseif(NOT HDF5_FOUND AND NOT _HDF5_NEED_TO_SEARCH)
   # Compiler wrappers aren't being used by the build but were found and used
   # to determine necessary include and library flags
   set(HDF5_INCLUDE_DIRS)
@@ -680,6 +680,13 @@ if( NOT HDF5_FOUND )
     endif()
 endif()
 
+# If HDF5_REQUIRED_VARS is empty at this point, then it's likely that
+# something external is trying to explicitly pass already found
+# locations
+if(NOT HDF5_REQUIRED_VARS)
+    set(HDF5_REQUIRED_VARS HDF5_LIBRARIES HDF5_INCLUDE_DIRS)
+endif()
+
 find_package_handle_standard_args(HDF5
     REQUIRED_VARS ${HDF5_REQUIRED_VARS}
     VERSION_VAR   HDF5_VERSION

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

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


hooks/post-receive
-- 
CMake