Attachment #734884 for bug #809008

View | Details | Raw Unified | Return to bug 809008
Collapse All | Expand All

Lines 398-404 MACRO(MED_FIND_HDF5) Link Here

(-)c/config/cmake_files/medMacros.cmake (-1 / +1 lines)
398	##	398	##
399	## Requires 1.10.x version	399	## Requires 1.10.x version
400	##	400	##
401	IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)	401	IF (HDF5_VERSION VERSION_LESS 1.10.2)
402	MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")	402	MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
403	ENDIF()	403	ENDIF()
404	##	404	##

Lines 71-77 MEDfileCompatibility(const char* const filename, Link Here

(-)c/src/ci/MEDfileCompatibility.c (-1 / +1 lines)
71	_hversionMMR=10000_hmajeur+100_hmineur+_hrelease;	71	_hversionMMR=10000_hmajeur+100_hmineur+_hrelease;
72	/* ISCRUTE(_hversionMMR); */	72	/* ISCRUTE(_hversionMMR); */
73	/* ISCRUTE(HDF_VERSION_NUM_REF); */	73	/* ISCRUTE(HDF_VERSION_NUM_REF); */
74	if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;	74	if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE;
75		75
76	/* TODO : Vérifier si la version mineure HDF du fichier est supérieur	76	/* TODO : Vérifier si la version mineure HDF du fichier est supérieur
77	à la version mineure de la bibliothèque HDF utilisée */	77	à la version mineure de la bibliothèque HDF utilisée */

Lines 84-90 med_idt _MEDfileCreate(const char * const filename, const med_access_mode access Link Here

(-)c/src/hdfi/_MEDfileCreate.c (-1 / +1 lines)
84	* En HDF5-1.10.0p1 cela n'a aucun effet !	84	* En HDF5-1.10.0p1 cela n'a aucun effet !
85	* Un test autoconf permet de fixer un intervalle de version HDF à MED.	85	* Un test autoconf permet de fixer un intervalle de version HDF à MED.
86	*/	86	*/
87	#if H5_VERS_MINOR > 10	87	#if H5_VERS_MINOR > 12
88	#error "Don't forget to change the compatibility version of the library !"	88	#error "Don't forget to change the compatibility version of the library !"
89	#endif	89	#endif
90		90

Lines 72-78 med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod Link Here

(-)c/src/hdfi/_MEDfileOpen.c (-1 / +1 lines)
72		72
73	• The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).	73	• The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order).
74	*/	74	*/
75	#if H5_VERS_MINOR > 10	75	#if H5_VERS_MINOR > 12
76	#error "Don't forget to change the compatibility version of the library !"	76	#error "Don't forget to change the compatibility version of the library !"
77	#endif	77	#endif
78	/* L'avantage de bloquer le modèle interne HDF5	78	/* L'avantage de bloquer le modèle interne HDF5

Lines 434-440 med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile Link Here

(-)c/src/hdfi/_MEDmemFileOpen.c (-1 / +1 lines)
434	goto ERROR;	434	goto ERROR;
435	}	435	}
436		436
437	#if H5_VERS_MINOR > 10	437	#if H5_VERS_MINOR > 12
438	#error "Don't forget to change the compatibility version of the library !"	438	#error "Don't forget to change the compatibility version of the library !"
439	#endif	439	#endif
440	if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {	440	if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {

Lines 64-70 med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc Link Here

(-)c/src/hdfi/_MEDparFileCreate.c (-1 / +1 lines)
64	* En HDF5-1.10.0p1 cela n'a aucun effet !	64	* En HDF5-1.10.0p1 cela n'a aucun effet !
65	* Un test autoconf permet de fixer un intervalle de version HDF à MED.	65	* Un test autoconf permet de fixer un intervalle de version HDF à MED.
66	*/	66	*/
67	#if H5_VERS_MINOR > 10	67	#if H5_VERS_MINOR > 12
68	#error "Don't forget to change the compatibility version of the library !"	68	#error "Don't forget to change the compatibility version of the library !"
69	#endif	69	#endif
70		70

Lines 55-61 med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access Link Here

(-)c/src/hdfi/_MEDparFileOpen.c (-1 / +1 lines)
55	MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);	55	MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
56	goto ERROR;	56	goto ERROR;
57	}	57	}
58	#if H5_VERS_MINOR > 10	58	#if H5_VERS_MINOR > 12
59	#error "Don't forget to change the compatibility version of the library !"	59	#error "Don't forget to change the compatibility version of the library !"
60	#endif	60	#endif
61	if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {	61	if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {

Lines 113-119 Link Here

(-)med-4.1.0/src/ci/MEDfileCompatibility.c.old (-1 / +1 lines)
113	#if MED_NUM_MAJEUR != 4	113	#if MED_NUM_MAJEUR != 4
114	#error "Don't forget to update the test version here when you change the major version of the library !"	114	#error "Don't forget to update the test version here when you change the major version of the library !"
115	#endif	115	#endif
116	#if H5_VERS_MINOR > 10	116	#if H5_VERS_MINOR > 12
117	#error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"	117	#error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
118	#error "Cf. _MEDfileCreate ..."	118	#error "Cf. _MEDfileCreate ..."
119	#endif	119	#endif

Lines 109-115 Link Here

(-)med-4.1.0/config/cmake_files/deprecated/FindHDF5.cmake.old (-1 / +1 lines)
109	SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR})	109	SET(HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIR})
110	ENDIF(${HDF5_INCLUDE_DIR} STREQUAL /usr/include)	110	ENDIF(${HDF5_INCLUDE_DIR} STREQUAL /usr/include)
111	ENDIF(HDF5_ROOT_USER)	111	ENDIF(HDF5_ROOT_USER)
112	SET(HDF5_DEFINITIONS "-DH5_USE_16_API -D_HDF5USEDLL_")	112	SET(HDF5_DEFINITIONS "-DH5_USE_16_API -DH5_USE_18_API -D_HDF5USEDLL_")
113	MESSAGE(STATUS "${HDF5_INCLUDE_TO_FIND} found in ${HDF5_INCLUDE_DIR}")	113	MESSAGE(STATUS "${HDF5_INCLUDE_TO_FIND} found in ${HDF5_INCLUDE_DIR}")
114	ELSE(HDF5_INCLUDE_DIR)	114	ELSE(HDF5_INCLUDE_DIR)
115	SET(HDF5_STATUS 0)	115	SET(HDF5_STATUS 0)

Lines 453-459 Link Here

(-)med-4.1.0/config/cmake_files/medMacros.cmake.old (-1 / +1 lines)
453	##	453	##
454	##	454	##
455		455
456	ADD_DEFINITIONS(-DH5_USE_16_API)	456	ADD_DEFINITIONS(-DH5_USE_16_API -DH5_USE_18_API)
457	IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS)	457	IF(WIN32 AND MEDFILE_BUILD_SHARED_LIBS)
458	ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1)	458	ADD_DEFINITIONS(-D_HDF5USEDLL_ -DH5_BUILT_AS_DYNAMIC_LIB=1)
459	ENDIF()	459	ENDIF()

Lines 167-173 Link Here

(-)med-4.1.0/config/med_check_hdf5.m4.old (-1 / +1 lines)
167		167
168		168
169	# AC_DEFINE(H5_USE_16_API,[],[Using HDF5-1.6 API compatibility with HDF5 1.8 libraries])	169	# AC_DEFINE(H5_USE_16_API,[],[Using HDF5-1.6 API compatibility with HDF5 1.8 libraries])
170	HDF5_CPPFLAGS="-DH5_USE_16_API"	170	HDF5_CPPFLAGS="-DH5_USE_16_API -DH5_USE_18_API"
171	HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I$hdf5include"	171	HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I$hdf5include"
172	HDF5_LDFLAGS="-L$hdf5lib"	172	HDF5_LDFLAGS="-L$hdf5lib"
173	LDFLAGS="$LDFLAGS_save"	173	LDFLAGS="$LDFLAGS_save"

Lines 7786-7792 Link Here

(-)med-4.1.0/configure.old (-1 / +1 lines)
7786		7786
7787		7787
7788	# AC_DEFINE(H5_USE_16_API,[],[Using HDF5-1.6 API compatibility with HDF5 1.8 libraries])	7788	# AC_DEFINE(H5_USE_16_API,[],[Using HDF5-1.6 API compatibility with HDF5 1.8 libraries])
7789	HDF5_CPPFLAGS="-DH5_USE_16_API"	7789	HDF5_CPPFLAGS="-DH5_USE_16_API -DH5_USE_18_API"
7790	HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I$hdf5include"	7790	HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I$hdf5include"
7791	HDF5_LDFLAGS="-L$hdf5lib"	7791	HDF5_LDFLAGS="-L$hdf5lib"
7792	LDFLAGS="$LDFLAGS_save"	7792	LDFLAGS="$LDFLAGS_save"

Return to bug 809008