[Cmake-commits] CMake branch, next, updated. v3.8.0-rc2-365-g1b28b4e

[Kitware Robot]

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  1b28b4e3dc7e74579ba3e41801a55e8da42eba3a (commit)
       via  c6bef559f308ea6715a3395562ee66e8f8825b9d (commit)
      from  47654380fde8c0617777daa1614b2c1c60666085 (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=1b28b4e3dc7e74579ba3e41801a55e8da42eba3a
commit 1b28b4e3dc7e74579ba3e41801a55e8da42eba3a
Merge: 4765438 c6bef55
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 6 18:11:35 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Mar 6 13:11:40 2017 -0500

    Stage topic 'FindHDF5-definitions-fix'
    
    Topic-id: 22872
    Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/548


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c6bef559f308ea6715a3395562ee66e8f8825b9d
commit c6bef559f308ea6715a3395562ee66e8f8825b9d
Author:     Kris Thielemans <kris.f.thielemans at hotmail.com>
AuthorDate: Sat Mar 4 06:24:39 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 6 13:09:49 2017 -0500

    FindHDF5: set HDF5_<lang>_INCLUDE_DIRS in all cases
    
    In the case that we're using `find_path` to find the include directory,
    only the `_DIR` variable was set, while in all other cases only the
    `_DIRS` variable was set.  Set the `_DIRS` variable in all cases (while
    keeping `_DIR` as result of `find_path`).  Also document the `_DIRS`
    variable.
    
    Fixes: #16694

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 5e1b520..4884174 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -69,6 +69,9 @@
 #   HDF5_C_DEFINITIONS -- Required compiler definitions for HDF5 C bindings
 #   HDF5_CXX_DEFINITIONS -- Required compiler definitions for HDF5 C++ bindings
 #   HDF5_Fortran_DEFINITIONS -- Required compiler definitions for HDF5 Fortran bindings
+#   HDF5_C_INCLUDE_DIRS -- Required include directories for HDF5 C bindings
+#   HDF5_CXX_INCLUDE_DIRS -- Required include directories for HDF5 C++ bindings
+#   HDF5_Fortran_INCLUDE_DIRS -- Required include directories for HDF5 Fortran bindings
 #   HDF5_C_LIBRARIES - Required libraries for the HDF5 C bindings
 #   HDF5_CXX_LIBRARIES - Required libraries for the HDF5 C++ bindings
 #   HDF5_Fortran_LIBRARIES - Required libraries for the HDF5 Fortran bindings
@@ -696,6 +699,8 @@ if( NOT HDF5_FOUND )
             ${_HDF5_SEARCH_OPTS}
         )
         mark_as_advanced(HDF5_${__lang}_INCLUDE_DIR)
+        # set the _DIRS variable as this is what the user will normally use
+        set(HDF5_${__lang}_INCLUDE_DIRS ${HDF5_${__lang}_INCLUDE_DIR})
         list(APPEND HDF5_INCLUDE_DIRS ${HDF5_${__lang}_INCLUDE_DIR})
 
         # find the HDF5 libraries

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

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


hooks/post-receive
-- 
CMake