[Cmake-commits] CMake branch, next, updated. v3.3.1-2692-g8033831

[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  8033831b5e3475ea52eaf83ab219615dee2be1df (commit)
       via  f7f73df1b3e58f55178f899352b6ffa9b4b14cb6 (commit)
       via  19e7db07e36b03e7d57b80c8f9732347116d8c5d (commit)
      from  52bfa089205632b0a64185c37741786877846f62 (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=8033831b5e3475ea52eaf83ab219615dee2be1df
commit 8033831b5e3475ea52eaf83ab219615dee2be1df
Merge: 52bfa08 f7f73df
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 1 11:17:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 1 11:17:33 2015 -0400

    Merge topic 'FindHDF5-updates' into next
    
    f7f73df1 FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HL
    19e7db07 FindHDF5: Fix support for HL and Fortran_HL components


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7f73df1b3e58f55178f899352b6ffa9b4b14cb6
commit f7f73df1b3e58f55178f899352b6ffa9b4b14cb6
Author:     Paul Romano <paul.k.romano at gmail.com>
AuthorDate: Tue Sep 1 09:20:25 2015 +0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 1 10:56:51 2015 -0400

    FindHDF5: Add hdf5_hl to list of libraries to search for Fortran_HL
    
    When the Fortran_HL component is specified, the hdf5_hl library is not included
    in HDF5_LIBRARIES which causes a bunch of undefined references at link
    time. This commit adds hdf5_hl to the list of libraries to search for when the
    Fortran_HL component is specified.

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 47d85f7..a449132 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -234,7 +234,7 @@ if( NOT HDF5_FOUND )
     set( HDF5_CXX_LIBRARY_NAMES_INIT hdf5_cpp ${HDF5_C_LIBRARY_NAMES_INIT} )
     set( HDF5_Fortran_LIBRARY_NAMES_INIT hdf5_fortran
         ${HDF5_C_LIBRARY_NAMES_INIT} )
-    set( HDF5_Fortran_HL_LIBRARY_NAMES_INIT hdf5hl_fortran
+    set( HDF5_Fortran_HL_LIBRARY_NAMES_INIT hdf5hl_fortran hdf5_hl
         ${HDF5_Fortran_LIBRARY_NAMES_INIT} )
 
     foreach( LANGUAGE ${HDF5_LANGUAGE_BINDINGS} )

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=19e7db07e36b03e7d57b80c8f9732347116d8c5d
commit 19e7db07e36b03e7d57b80c8f9732347116d8c5d
Author:     Paul Romano <paul.k.romano at gmail.com>
AuthorDate: Tue Sep 1 09:18:51 2015 +0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Sep 1 10:56:40 2015 -0400

    FindHDF5: Fix support for HL and Fortran_HL components
    
    Define HDF5_{Fortran_,}HL_COMPILE_LINE so that HDF5_{Fortran_,}HL_INCLUDE_DIR
    and HDF5_{Fortran_,}HL_LIBRARIES are found when the macro is invoked for HL and
    Fortran_HL components.  (Use patch from debian cmake-data package.)

diff --git a/Modules/FindHDF5.cmake b/Modules/FindHDF5.cmake
index 3bd6f1e..47d85f7 100644
--- a/Modules/FindHDF5.cmake
+++ b/Modules/FindHDF5.cmake
@@ -225,6 +225,8 @@ if( NOT HDF5_FOUND )
     _HDF5_invoke_compiler( C HDF5_C_COMPILE_LINE HDF5_C_RETURN_VALUE )
     _HDF5_invoke_compiler( CXX HDF5_CXX_COMPILE_LINE HDF5_CXX_RETURN_VALUE )
     _HDF5_invoke_compiler( Fortran HDF5_Fortran_COMPILE_LINE HDF5_Fortran_RETURN_VALUE )
+    set(HDF5_HL_COMPILE_LINE ${HDF5_C_COMPILE_LINE})
+    set(HDF5_Fortran_HL_COMPILE_LINE ${HDF5_Fortran_COMPILE_LINE})
 
     # seed the initial lists of libraries to find with items we know we need
     set( HDF5_C_LIBRARY_NAMES_INIT hdf5 )

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

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


hooks/post-receive
-- 
CMake