Fix HDF5 detection with CMake 3.6.
authorGhislain Antony Vaillant <ghisvail@gmail.com>
Thu, 1 Sep 2016 17:28:21 +0000 (18:28 +0100)
committerGhislain Antony Vaillant <ghisvail@gmail.com>
Sat, 26 Nov 2016 11:45:27 +0000 (11:45 +0000)
Gbp-Pq: Name Fix-HDF5-detection-with-CMake-3.6.patch

CMakeLists.txt

index 665e106627eec82f661ff92cfcfb2b42d1353e72..5e9b1a970aacd333059c0ed2ab59b9575b28785a 100644 (file)
@@ -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" )