ca75aed246
* Add myself to Uploaders. * Build-Depend on liblzma-dev and libjsoncpp-dev. * Drop patches merged upstream: - fix-FindImageMagick-1.diff - fix-FindImageMagick-2.diff - FindJNI_ppc64le.diff - hurd_host_system_processor.diff * Refresh patches: - FindBoost_add_-lpthread_#563479.diff - FindJNI.cmake.mips.patch - fix-ftbfs-on-kfreebsd.patch - fix-hdf5-hl.patch - qt_import_dir_variable.diff * Bump Standards-Version to 3.9.6. * Fix "Typo in cpack documentation" by adding new patch cpack-doc-typo.patch (Closes: #760298)
18 lines
940 B
Diff
18 lines
940 B
Diff
Description: 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.
|
|
Author: Gilles Filippini <pini@debian.org>
|
|
Index: cmake/Modules/FindHDF5.cmake
|
|
===================================================================
|
|
--- cmake.orig/Modules/FindHDF5.cmake
|
|
+++ cmake/Modules/FindHDF5.cmake
|
|
@@ -223,6 +223,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 )
|