From 19e7db07e36b03e7d57b80c8f9732347116d8c5d Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 1 Sep 2015 09:18:51 +0700 Subject: 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.) --- Modules/FindHDF5.cmake | 2 ++ 1 file changed, 2 insertions(+) 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 ) -- cgit v0.12 From f7f73df1b3e58f55178f899352b6ffa9b4b14cb6 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 1 Sep 2015 09:20:25 +0700 Subject: 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. --- Modules/FindHDF5.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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} ) -- cgit v0.12