[Cmake-commits] CMake branch, next, updated. v3.7.2-2529-g70284f1

[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  70284f1b4c89252e2801915312e1c5acac7cb61e (commit)
       via  cf0d8f1fd6ad5d4bc85d7788af459238df494260 (commit)
      from  f010baec3bc9df9a1fb23aab03128a2d203d6787 (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=70284f1b4c89252e2801915312e1c5acac7cb61e
commit 70284f1b4c89252e2801915312e1c5acac7cb61e
Merge: f010bae cf0d8f1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 3 10:58:49 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 3 10:58:49 2017 -0500

    Merge topic 'FindHDF5-fix-HDF5_ROOT' into next
    
    cf0d8f1f FindHDF5: Restore HDF5_INCLUDE_DIR in all code paths


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf0d8f1fd6ad5d4bc85d7788af459238df494260
commit cf0d8f1fd6ad5d4bc85d7788af459238df494260
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 3 10:57:10 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 3 10:57:10 2017 -0500

    FindHDF5: Restore HDF5_INCLUDE_DIR in all code paths
    
    This compatibility variable should be set no matter which method was
    used to find HDF5.  Even if `HDF5_INCLUDE_DIRS` was set by copying the
    `HDF5_INCLUDE_DIR` value from `hdf5-config.cmake` it will not hurt to
    copy the same value back.
    
    Issue: #16566

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index b10e313..e1199a7 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -796,17 +796,18 @@ if( NOT HDF5_FOUND )
         "HDF5 library compiled with parallel IO support" )
     mark_as_advanced( HDF5_IS_PARALLEL )
 
-    # For backwards compatibility we set HDF5_INCLUDE_DIR to the value of
-    # HDF5_INCLUDE_DIRS
-    if( HDF5_INCLUDE_DIRS )
-        set( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )
-    endif()
     set(HDF5_REQUIRED_VARS HDF5_LIBRARIES HDF5_INCLUDE_DIRS)
     if(FIND_HL)
         list(APPEND HDF5_REQUIRED_VARS HDF5_HL_LIBRARIES)
     endif()
 endif()
 
+# For backwards compatibility we set HDF5_INCLUDE_DIR to the value of
+# HDF5_INCLUDE_DIRS
+if( HDF5_INCLUDE_DIRS )
+  set( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )
+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

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

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


hooks/post-receive
-- 
CMake