From: Ghislain Antony Vaillant Date: Thu, 1 Sep 2016 17:28:21 +0000 (+0100) Subject: Fix HDF5 detection with CMake 3.6. X-Git-Tag: archive/raspbian/1.3.3-3+rpi1^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab0e9fcfa56488f9e9b850ebb0161c02f5d4fe3c;p=ismrmrd.git Fix HDF5 detection with CMake 3.6. Gbp-Pq: Name Fix-HDF5-detection-with-CMake-3.6.patch --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 665e106..5e9b1a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,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 () set (ISMRMRD_DATASET_SUPPORT false) @@ -146,7 +146,7 @@ if (HDF5_FOUND AND WIN32 AND ISMRMRD_INSTALL_DEPENDENCIES) if(DEFINED ENV{HDF5_ROOT}) set(HDF5_BIN_DIR $ENV{HDF5_ROOT}/bin) else () - set(HDF5_BIN_DIR ${HDF5_C_INCLUDE_DIR}/../bin) + set(HDF5_BIN_DIR ${HDF5_INCLUDE_DIRS}/../bin) endif () message("Install hdf5 libraries from ${HDF5_BIN_DIR} ") install( DIRECTORY ${HDF5_BIN_DIR} DESTINATION bin/.. FILES_MATCHING PATTERN "*.dll" )