diff --git c/config/cmake_files/medMacros.cmake w/config/cmake_files/medMacros.cmake index b79f387..7c82cec 100644 --- c/config/cmake_files/medMacros.cmake +++ w/config/cmake_files/medMacros.cmake @@ -398,7 +398,7 @@ MACRO(MED_FIND_HDF5) ## ## Requires 1.10.x version ## - IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) + IF (HDF5_VERSION VERSION_LESS 1.10.2) MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") ENDIF() ## diff --git c/src/ci/MEDfileCompatibility.c w/src/ci/MEDfileCompatibility.c index b5c42d1..d94e6a8 100644 --- c/src/ci/MEDfileCompatibility.c +++ w/src/ci/MEDfileCompatibility.c @@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const filename, _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease; /* ISCRUTE(_hversionMMR); */ /* ISCRUTE(HDF_VERSION_NUM_REF); */ - if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE; + if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE; /* TODO : Vérifier si la version mineure HDF du fichier est supérieur à la version mineure de la bibliothèque HDF utilisée */ diff --git c/src/hdfi/_MEDfileCreate.c w/src/hdfi/_MEDfileCreate.c index 34c75cc..66073c1 100644 --- c/src/hdfi/_MEDfileCreate.c +++ w/src/hdfi/_MEDfileCreate.c @@ -84,7 +84,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access * En HDF5-1.10.0p1 cela n'a aucun effet ! * Un test autoconf permet de fixer un intervalle de version HDF à MED. */ -#if H5_VERS_MINOR > 10 +#if H5_VERS_MINOR > 12 #error "Don't forget to change the compatibility version of the library !" #endif diff --git c/src/hdfi/_MEDfileOpen.c w/src/hdfi/_MEDfileOpen.c index 7d0b798..6a7de9a 100644 --- c/src/hdfi/_MEDfileOpen.c +++ w/src/hdfi/_MEDfileOpen.c @@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). */ -#if H5_VERS_MINOR > 10 +#if H5_VERS_MINOR > 12 #error "Don't forget to change the compatibility version of the library !" #endif /* L'avantage de bloquer le modèle interne HDF5 diff --git c/src/hdfi/_MEDmemFileOpen.c w/src/hdfi/_MEDmemFileOpen.c index 9449cda..a3f4adc 100644 --- c/src/hdfi/_MEDmemFileOpen.c +++ w/src/hdfi/_MEDmemFileOpen.c @@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile goto ERROR; } -#if H5_VERS_MINOR > 10 +#if H5_VERS_MINOR > 12 #error "Don't forget to change the compatibility version of the library !" #endif if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { diff --git c/src/hdfi/_MEDparFileCreate.c w/src/hdfi/_MEDparFileCreate.c index c6d9f44..b3b2a41 100644 --- c/src/hdfi/_MEDparFileCreate.c +++ w/src/hdfi/_MEDparFileCreate.c @@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc * En HDF5-1.10.0p1 cela n'a aucun effet ! * Un test autoconf permet de fixer un intervalle de version HDF à MED. */ -#if H5_VERS_MINOR > 10 +#if H5_VERS_MINOR > 12 #error "Don't forget to change the compatibility version of the library !" #endif diff --git c/src/hdfi/_MEDparFileOpen.c w/src/hdfi/_MEDparFileOpen.c index 0100729..dfad95c 100644 --- c/src/hdfi/_MEDparFileOpen.c +++ w/src/hdfi/_MEDparFileOpen.c @@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG); goto ERROR; } -#if H5_VERS_MINOR > 10 +#if H5_VERS_MINOR > 12 #error "Don't forget to change the compatibility version of the library !" #endif if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { --- med-4.1.0/src/ci/MEDfileCompatibility.c.old 2021-08-20 09:17:12.164865005 -0500 +++ med-4.1.0/src/ci/MEDfileCompatibility.c 2021-08-20 09:18:03.598103827 -0500 @@ -113,7 +113,7 @@ #if MED_NUM_MAJEUR != 4 #error "Don't forget to update the test version here when you change the major version of the library !" #endif -#if H5_VERS_MINOR > 10 +#if H5_VERS_MINOR > 12 #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" #error "Cf. _MEDfileCreate ..." #endif --- med-4.1.0/config/cmake_files/deprecated/FindHDF5.cmake.old 2021-08-20 14:08:51.264273175 -0500 +++ med-4.1.0/config/cmake_files/deprecated/FindHDF5.cmake 2021-08-20 14:09:51.845756742 -0500 @@ -109,7 +109,7 @@ SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR}) ENDIF(${HDF5_INCLUDE_DIR} STREQUAL /usr/include) ENDIF(HDF5_ROOT_USER) - SET(HDF5_DEFINITIONS "-DH5_USE_16_API -D_HDF5USEDLL_") + SET(HDF5_DEFINITIONS "-DH5_USE_16_API -DH5_USE_18_API -D_HDF5USEDLL_") MESSAGE(STATUS "${HDF5_INCLUDE_TO_FIND} found in ${HDF5_INCLUDE_DIR}") ELSE(HDF5_INCLUDE_DIR) SET(HDF5_STATUS 0) --- med-4.1.0/config/cmake_files/medMacros.cmake.old 2021-08-20 14:08:51.268273272 -0500 +++ med-4.1.0/config/cmake_files/medMacros.cmake 2021-08-20 14:10:21.854491625 -0500 @@ -453,7 +453,7 @@ ## ## - ADD_DEFINITIONS(-DH5_USE_16_API) + ADD_DEFINITIONS(-DH5_USE_16_API -DH5_USE_18_API) IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS) ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1) ENDIF() --- med-4.1.0/config/med_check_hdf5.m4.old 2021-08-20 14:08:51.268273272 -0500 +++ med-4.1.0/config/med_check_hdf5.m4 2021-08-20 14:10:42.190989648 -0500 @@ -167,7 +167,7 @@ # AC_DEFINE(H5_USE_16_API,[],[Using HDF5-1.6 API compatibility with HDF5 1.8 libraries]) - HDF5_CPPFLAGS="-DH5_USE_16_API" + HDF5_CPPFLAGS="-DH5_USE_16_API -DH5_USE_18_API" HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I$hdf5include" HDF5_LDFLAGS="-L$hdf5lib" LDFLAGS="$LDFLAGS_save" --- med-4.1.0/configure.old 2021-08-20 14:08:51.268273272 -0500 +++ med-4.1.0/configure 2021-08-20 14:11:04.003523790 -0500 @@ -7786,7 +7786,7 @@ # AC_DEFINE(H5_USE_16_API,[],[Using HDF5-1.6 API compatibility with HDF5 1.8 libraries]) - HDF5_CPPFLAGS="-DH5_USE_16_API" + HDF5_CPPFLAGS="-DH5_USE_16_API -DH5_USE_18_API" HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I$hdf5include" HDF5_LDFLAGS="-L$hdf5lib" LDFLAGS="$LDFLAGS_save"