[Cmake-commits] CMake branch, next, updated. v3.6.1-1731-g4cb699f

[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  4cb699fda5a6f70e1641deba4730a87fd287c6bb (commit)
       via  befe8648a3813e35869e8ba8291f43cb8bfca962 (commit)
      from  27e09e87e102af3e13c0912dcf83169ce4670e73 (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=4cb699fda5a6f70e1641deba4730a87fd287c6bb
commit 4cb699fda5a6f70e1641deba4730a87fd287c6bb
Merge: 27e09e8 befe864
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 2 15:23:58 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 2 15:23:58 2016 -0400

    Merge topic 'FindHDF5-fix-hl-fortran' into next
    
    befe8648 FindHDF5: Fix regression in finding hdf5hl_fortran


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=befe8648a3813e35869e8ba8291f43cb8bfca962
commit befe8648a3813e35869e8ba8291f43cb8bfca962
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Sep 2 13:40:46 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Sep 2 15:09:47 2016 -0400

    FindHDF5: Fix regression in finding hdf5hl_fortran
    
    Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching
    to correctly find HL for all bindings, 2016-05-12) accidentally dropped
    the name `hdf5hl_fortran` from the list of library names and replaced it
    with `hdf5_hl_fortran`.  IIUC the latter name is when HDF5 is built with
    CMake and the former name is for other build systems.  Since this is the
    non-CMake code path, user the former name.
    
    Closes: #16233

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index a898386..aa2764b 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -613,7 +613,7 @@ if( NOT HDF5_FOUND )
     set(HDF5_CXX_HL_LIBRARY_NAMES     hdf5_hl_cpp ${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_CXX_LIBRARY_NAMES})
 
     set(HDF5_Fortran_LIBRARY_NAMES    hdf5_fortran   ${HDF5_C_LIBRARY_NAMES})
-    set(HDF5_Fortran_HL_LIBRARY_NAMES hdf5_hl_fortran ${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_Fortran_LIBRARY_NAMES})
+    set(HDF5_Fortran_HL_LIBRARY_NAMES hdf5hl_fortran ${HDF5_C_HL_LIBRARY_NAMES} ${HDF5_Fortran_LIBRARY_NAMES})
 
     foreach(__lang IN LISTS HDF5_LANGUAGE_BINDINGS)
         # find the HDF5 include directories

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

Summary of changes:
 Modules/FindHDF5.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake