Fix FTBFS due to buggy HDF5 detection with CMake 3.6.

Gbp-Dch: Short
Closes: #835679
Thanks: Lucas Nussbaum for reporting.
parent 3552475d
From: Ghislain Antony Vaillant <ghisvail@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" )
......@@ -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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment