[netcdf] 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 master
in repository netcdf.

commit 43d5f945862e8bcd600ca0b986943c67f695b0df
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Aug 28 14:25:51 2016 +0200

    Add patch to fix HDF5 include directory with CMake >= 3.6.0.
---
 debian/changelog                       |  7 +++++++
 debian/patches/hdf5-include-path.patch | 20 ++++++++++++++++++++
 debian/patches/series                  |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5c7d5f9..a47b54b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+netcdf (1:4.4.1-2) UNRELEASED; urgency=medium
+
+  * Add patch to fix HDF5 include directory with CMake >= 3.6.0.
+    (closes: #835710)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 28 Aug 2016 13:58:35 +0200
+
 netcdf (1:4.4.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/hdf5-include-path.patch b/debian/patches/hdf5-include-path.patch
new file mode 100644
index 0000000..02106b9
--- /dev/null
+++ b/debian/patches/hdf5-include-path.patch
@@ -0,0 +1,20 @@
+Description: Fix HDF5 include directory with CMake >= 3.6.0.
+ HDF5_INCLUDE_DIR has been deprecated some time ago,
+ only HDF5_INCLUDE_DIRS is set for CMake >= 3.6.0.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/835710
+Forwarded: https://github.com/Unidata/netcdf-c/pull/311
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -572,6 +572,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
+     ##
+     # Include the HDF5 include directory.
+     ##
++    IF(HDF5_INCLUDE_DIRS AND NOT HDF5_INCLUDE_DIR)
++      SET(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
++    ENDIF()
++    MESSAGE(STATUS "Using HDF5 include dir: ${HDF5_INCLUDE_DIR}")
+     INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
+ 
+     ###
diff --git a/debian/patches/series b/debian/patches/series
index bf960a3..6fe7d53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 link-private.patch
 privacy-breach-logo.patch
 hdf5-library-path.patch
+hdf5-include-path.patch
 tst_fileinfo-link-hdf5.patch
 reproducible-settings.patch

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