Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Debian patch 2.8.12.1-1.6

Browse Source
This commit is contained in:
Gilles Filippini 2014-07-30 12:51:57 +02:00 committed by Felix Geyer
parent b353df6d1c
commit 4de62b31d9
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <pini@debian.org> Wed, 30 Jul 2014 12:51:57 +0200
cmake (2.8.12.1-1.5) unstable; urgency=medium
* Non-maintainer upload.

17
debian/patches/fix-hdf5-hl.patch vendored Normal file
View File

@ -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 <pini@debian.org>
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 )

1
debian/patches/series vendored
View File

@ -11,3 +11,4 @@ FindJNI.cmake.mips.patch
fix-FindImageMagick-1.diff
fix-FindImageMagick-2.diff
fix-FindFreetype-version.diff
fix-hdf5-hl.patch