From c371cf901867aba96bd37058aba032966fc4d314 Mon Sep 17 00:00:00 2001
From: Kris Thielemans <kris.f.thielemans@hotmail.com>
Date: Wed, 20 Dec 2017 08:57:54 +0000
Subject: [PATCH 1/3] update ISMRMRD version

This version incorporates our HDF5-related patches
---
 version_config.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/version_config.cmake b/version_config.cmake
index 69c76d9b..0c921344 100644
--- a/version_config.cmake
+++ b/version_config.cmake
@@ -100,8 +100,8 @@ else()
   #set(DEFAULT_Gadgetron_TAG 00b96376568278a595e78879026bb3b0d5fbb98d )
 
   ## ISMRMRD
-  set(DEFAULT_ISMRMRD_URL https://github.com/CCPPETMR/ismrmrd )
-  set(DEFAULT_ISMRMRD_TAG 35012c6c8000616546c2d6b1757eba0c5b21b2d4)
+  set(DEFAULT_ISMRMRD_URL https://github.com/ismrmrd/ismrmrd )
+  set(DEFAULT_ISMRMRD_TAG 42d93137cc16c270c8ba065edd2496483161bd21)
 
 endif()
 

From b9a975316a76c1e0085592bbd5d7d2f33da7694d Mon Sep 17 00:00:00 2001
From: Kris Thielemans <kris.f.thielemans@hotmail.com>
Date: Wed, 20 Dec 2017 08:59:48 +0000
Subject: [PATCH 2/3] fixes for HDF5

- use CMAKE_ARGS as opposed to explicit configure command. This means
that any variables marked as superbuild will be passed through. In
particular, it means that the "original" CMAKE_GENERATOR and
CMAKE_GENERATOR_PLATFORM, which are essential on Windows, are now
used to build HDF5.
- make output of source and build consistent with other projects
- no longer build examples and tools (see #12)
---
 SuperBuild/External_HDF5.cmake | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/SuperBuild/External_HDF5.cmake b/SuperBuild/External_HDF5.cmake
index e6f62a63..ca631032 100644
--- a/SuperBuild/External_HDF5.cmake
+++ b/SuperBuild/External_HDF5.cmake
@@ -42,17 +42,17 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
     set(CLANG_ARG -DCMAKE_COMPILER_IS_CLANGXX:BOOL=ON)
   endif()
 
-  set(HDF5_SOURCE_DIR ${SOURCE_DOWNLOAD_CACHE}/${proj}-prefix/src/HDF5/hdf5-1.10.0-patch1 )
+  #set(HDF5_SOURCE_DIR ${SOURCE_DOWNLOAD_CACHE}/${proj}-prefix/src/HDF5/hdf5-1.10.0-patch1 )
 
   ExternalProject_Add(${proj}
     ${${proj}_EP_ARGS}
     URL ${${proj}_URL}
     URL_HASH MD5=${${proj}_MD5}
-    BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}
-    CONFIGURE_COMMAND ${CMAKE_COMMAND}
-                             ${CLANG_ARG}
-                             -DCMAKE_INSTALL_PREFIX:PATH=${HDF5_Install_Dir} "${HDF5_SOURCE_DIR}"
-
+    SOURCE_DIR ${SOURCE_DOWNLOAD_CACHE}/${proj}
+    #BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${proj}
+    CMAKE_ARGS
+        ${CLANG_ARG}
+        -DHDF5_BUILD_EXAMPLES=OFF -DHDF5_BUILD_TOOLS=OFF -DHDF5_BUILD_HL_LIB=OFF -DBUILD_TESTING=OFF
     INSTALL_DIR ${HDF5_Install_Dir}
   )
 

From 360403c399cf87c170117910e9cba6048a9604e7 Mon Sep 17 00:00:00 2001
From: Kris Thielemans <kris.f.thielemans@hotmail.com>
Date: Wed, 20 Dec 2017 12:28:22 +0000
Subject: [PATCH 3/3] upgrade to HDF5 1.10.1

---
 version_config.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/version_config.cmake b/version_config.cmake
index 0c921344..e547891e 100644
--- a/version_config.cmake
+++ b/version_config.cmake
@@ -47,8 +47,13 @@ set(FFTW3double_URL ${FFTW3_URL})
 set(FFTW3double_MD5 ${FFTW3_MD5})
 
 ## HDF5
-set(HDF5_URL https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/CMake-hdf5-1.10.0-patch1.tar.gz )
-set(HDF5_MD5 6fb456d03a60f358f3c077288a6d1cd8 )
+#if (WIN32)
+  set(HDF5_URL https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.1/src/hdf5-1.10.1.tar.gz)
+  set(HDF5_MD5 43a2f9466702fb1db31df98ae6677f15 )
+#else()
+#  set(HDF5_URL https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.10/hdf5-1.10.0-patch1/src/CMake-hdf5-1.10.0-patch1.tar.gz )
+#  set(HDF5_MD5 6fb456d03a60f358f3c077288a6d1cd8 )
+#endif()
 
 ## SWIG
 if (WIN32)