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} ) diff --git a/version_config.cmake b/version_config.cmake index 69c76d9b..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) @@ -100,8 +105,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()