[med-svn] [ismrmrd] 01/06: Fix FTBFS due to buggy HDF5 detection with CMake 3.6.

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository ismrmrd.

commit f8cf43ca3875ef438126ebe11bd6344c726f21c8
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Sep 1 23:10:42 2016 +0100

    Fix FTBFS due to buggy HDF5 detection with CMake 3.6.
    
    Gbp-Dch: Short
    Closes: #835679
    Thanks: Lucas Nussbaum for reporting.
---
 .../Fix-HDF5-detection-with-CMake-3.6.patch        | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch b/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch
new file mode 100644
index 0000000..e312166
--- /dev/null
+++ b/debian/patches/Fix-HDF5-detection-with-CMake-3.6.patch
@@ -0,0 +1,30 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Thu, 1 Sep 2016 18:28:21 +0100
+Subject: Fix HDF5 detection with CMake 3.6.
+
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 456d4f4..ccdae44 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -97,7 +97,7 @@ find_package(HDF5 1.8 COMPONENTS C)
+ if (HDF5_FOUND)
+     set (ISMRMRD_DATASET_SUPPORT true)
+     set (ISMRMRD_DATASET_SOURCES libsrc/dataset.c libsrc/dataset.cpp)
+-    set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_C_INCLUDE_DIR})
++    set (ISMRMRD_DATASET_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
+     set (ISMRMRD_DATASET_LIBRARIES ${HDF5_LIBRARIES})
+ else (HDF5_FOUND)
+     set (ISMRMRD_DATASET_SUPPORT false)
+@@ -131,7 +131,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES)
+     if(DEFINED ENV{HDF5_ROOT})
+         set(HDF5_BIN_DIR $ENV{HDF5_ROOT}/bin)
+     else (DEFINED ENV{HDF5_ROOT})
+-        set(HDF5_BIN_DIR ${HDF5_C_INCLUDE_DIR}/../bin)
++        set(HDF5_BIN_DIR ${HDF5_INCLUDE_DIRS}/../bin)
+     endif (DEFINED ENV{HDF5_ROOT})
+     message("Install hdf5 libraries from ${HDF5_BIN_DIR} ")
+     install( DIRECTORY ${HDF5_BIN_DIR} DESTINATION bin/.. FILES_MATCHING PATTERN "*.dll" )
diff --git a/debian/patches/series b/debian/patches/series
index 5873966..ec1ee78 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Disable-HTML-timestamps.patch
 Explicit-64-bit-shifts-for-flags.patch
 Use-explicit-64-bit-shifts-in-testsuite.patch
 Use-Debian-CMake-find-module-location.patch
+Fix-HDF5-detection-with-CMake-3.6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ismrmrd.git