From 4de62b31d94b2caf354ea0f7962b957d17268cd4 Mon Sep 17 00:00:00 2001 From: Gilles Filippini Date: Wed, 30 Jul 2014 12:51:57 +0200 Subject: [PATCH] Imported Debian patch 2.8.12.1-1.6 --- debian/changelog | 7 +++++++ debian/patches/fix-hdf5-hl.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 3 files changed, 25 insertions(+) create mode 100644 debian/patches/fix-hdf5-hl.patch diff --git a/debian/changelog b/debian/changelog index a1d93501f..8b54cb21f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cmake (2.8.12.1-1.6) unstable; urgency=low + + * Non-maintainer upload. + * Fix HDF5 macro for HL and Fortran_HL components (closes: #756108). + + -- Gilles Filippini Wed, 30 Jul 2014 12:51:57 +0200 + cmake (2.8.12.1-1.5) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/patches/fix-hdf5-hl.patch b/debian/patches/fix-hdf5-hl.patch new file mode 100644 index 000000000..eda145df2 --- /dev/null +++ b/debian/patches/fix-hdf5-hl.patch @@ -0,0 +1,17 @@ +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 +Index: cmake-2.8.12.1/Modules/FindHDF5.cmake +=================================================================== +--- cmake-2.8.12.1.orig/Modules/FindHDF5.cmake 2013-11-05 20:07:22.000000000 +0100 ++++ cmake-2.8.12.1/Modules/FindHDF5.cmake 2014-07-26 11:39:19.785790997 +0200 +@@ -210,6 +210,8 @@ + _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 ) diff --git a/debian/patches/series b/debian/patches/series index f81bb250e..82b1b5f88 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ FindJNI.cmake.mips.patch fix-FindImageMagick-1.diff fix-FindImageMagick-2.diff fix-FindFreetype-version.diff +fix-hdf5-hl.patch