[pdal] 01/03: Add patch to fix HDF5 include directory with CMake >= 3.6.0.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch 1.2.0
in repository pdal.

commit 589af009b709f2228183b4c109e4c80ea874992c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 28 15:03:29 2016 +0200

    Add patch to fix HDF5 include directory with CMake >= 3.6.0.
---
 debian/changelog                    |  6 ++++++
 debian/patches/cmake-3.6-hdf5.patch | 18 ++++++++++++++++++
 debian/patches/series               |  1 +
 debian/rules                        |  4 ----
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db2202d..ab66eda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pdal (1.2.0-6) UNRELEASED; urgency=medium
+
+  * Add patch to fix HDF5 include directory with CMake >= 3.6.0.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 28 Aug 2016 15:02:48 +0200
+
 pdal (1.2.0-5) unstable; urgency=medium
 
   * Append HDF5 include path for H5Cpp.h.
diff --git a/debian/patches/cmake-3.6-hdf5.patch b/debian/patches/cmake-3.6-hdf5.patch
new file mode 100644
index 0000000..dcd044a
--- /dev/null
+++ b/debian/patches/cmake-3.6-hdf5.patch
@@ -0,0 +1,18 @@
+Description: Fix HDF5 include directory with CMake >= 3.6.0.
+ HDF5_INCLUDE_DIR is deprecated some time ago,
+ only HDF5_INCLUDE_DIRS is set now.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/PDAL/PDAL/pull/1292
+
+--- a/cmake/hdf5.cmake
++++ b/cmake/hdf5.cmake
+@@ -5,6 +5,9 @@
+ set (HDF5_FIND_COMPONENTS "CXX")
+ find_package(HDF5 COMPONENTS CXX REQUIRED)
+ if(HDF5_FOUND)
++    if(HDF5_INCLUDE_DIRS AND NOT HDF5_INCLUDE_DIR)
++        set(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
++    endif()
+     include_directories(${HDF5_INCLUDE_DIR})
+     add_definitions(-DHAVE_HDF5=1)
+     set(PDAL_HAVE_HDF5 1)
diff --git a/debian/patches/series b/debian/patches/series
index 47bdc55..8d0997f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ privacy-breach.patch
 hurd.patch
 source_date_epoch.patch
 sphinx-ext-pngmath-deprecated.patch
+cmake-3.6-hdf5.patch
diff --git a/debian/rules b/debian/rules
index 65c6585..4a85120 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,6 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all,-pie
 
 CXXFLAGS += $(CPPFLAGS)
 
-ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
-        export DEB_CXXFLAGS_MAINT_APPEND := -I/usr/include/hdf5/serial
-endif
-
 UPSTREAM_VERSION  = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 BUILD_DATE        = $(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u "+%d %B %Y" -f -)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pdal.git