Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Utkarsh Ayachit
ParaView-Superbuild
Commits
2cac4c90
Commit
2cac4c90
authored
Dec 02, 2020
by
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
Changes
5
Hide whitespace changes
Inline
Side-by-side
projects/apple-unix/patches/silo-hdf5-1.12.patch
0 → 100644
View file @
2cac4c90
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
projects/apple-unix/silo.cmake
View file @
2cac4c90
...
...
@@ -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
()
projects/win32/patches/silo-hdf5-1.12.patch
0 → 100644
View file @
2cac4c90
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
projects/win32/silo.cmake
View file @
2cac4c90
...
...
@@ -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
...
...
superbuild
@
44aac086
Compare
ca253a6a
...
44aac086
Subproject commit
ca253a6aedb951e5ac8e91a55a26c123a2a78b38
Subproject commit
44aac086edc85a310bb1f72004211c61d321ba34
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment