Commit 2cac4c90 authored by Utkarsh Ayachit's avatar Utkarsh Ayachit
Browse files

hdf5: use 1.12 API by default.

Requires that silo explicitly adds #define's to force 1.10 API.
parent de1c1fed
diff -u5 -Nru silo-4.10.2-bsd/config/config.h.in silo-4.10.2-bsd.hdf5/config/config.h.in
--- silo-4.10.2-bsd/config/config.h.in 2014-10-13 20:22:32.000000000 -0400
+++ silo-4.10.2-bsd.hdf5/config/config.h.in 2020-12-02 15:21:20.937531495 -0500
@@ -60,10 +60,13 @@
#undef HAVE_HDF5_DRIVER
/* Define to 1 if you have the <hdf5.h> header file. */
#undef HAVE_HDF5_H
+/* use HDF5 1.10 API */
+#define H5_USE_110_API
+
/* Define to 1 if you have the <history.h> header file. */
#undef HAVE_HISTORY_H
/* Support for Lindstrom hex/quad mesh compression */
#undef HAVE_HZIP
......@@ -62,3 +62,8 @@ if (UNIX)
superbuild_apply_patch(silo ppc64le-linux
"Patch for Power 9 architecture")
endif ()
if (hdf5_enabled)
superbuild_apply_patch(silo hdf5-1.12
"Support HDF5 1.12 ")
endif()
diff -u5 -Nru silo-4.10.2-bsd/SiloWindows/include/config.h silo-4.10.2-bds.hdf5/SiloWindows/include/config.h
--- silo-4.10.2-bsd/SiloWindows/include/config.h 2014-10-13 20:22:34.000000000 -0400
+++ silo-4.10.2-bds.hdf5/SiloWindows/include/config.h 2020-12-02 15:19:03.779317849 -0500
@@ -194,5 +194,8 @@
/* Override longjmp */
/* #undef longjmp */
/* Override setjmp */
/* #undef setjmp */
+
+/* use HDF5 1.10 API */
+#define H5_USE_110_API
......@@ -61,6 +61,8 @@ superbuild_apply_patch(silo snprintf
"Remove snprint redefinition for VS2015 and newer")
superbuild_apply_patch(silo hdf5-1.10
"Support HDF5 1.10")
superbuild_apply_patch(silo hdf5-1.12
"Support HDF5 1.12 ")
superbuild_add_extra_cmake_args(
-DSILO_INCLUDE_DIR:PATH=<INSTALL_DIR>/include
......
Subproject commit ca253a6aedb951e5ac8e91a55a26c123a2a78b38
Subproject commit 44aac086edc85a310bb1f72004211c61d321ba34
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment