From b33fdb17c35e1ba1e267a7a67426304da5166fc6 Mon Sep 17 00:00:00 2001
From: Allen Byrne
Date: Mon, 20 Aug 2018 11:25:09 -0500
Subject: HDFFV-10547 requires updated examples version
---
config/cmake/scripts/HDF5options.cmake | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config/cmake/scripts/HDF5options.cmake b/config/cmake/scripts/HDF5options.cmake
index 82ab04a..c5f08ed 100755
--- a/config/cmake/scripts/HDF5options.cmake
+++ b/config/cmake/scripts/HDF5options.cmake
@@ -63,6 +63,9 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ALLOW_EXTERNAL_SUPPORT:STRING
#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_SUPPORT:BOOL=OFF")
#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ENABLE_SZIP_ENCODING:BOOL=OFF")
+#### package examples ####
+#set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACK_EXAMPLES:BOOL=ON -DHDF5_EXAMPLES_COMPRESSED:STRING=HDF5Examples-1.10.9-Source.tar.gz -DHDF5_EXAMPLES_COMPRESSED_DIR:PATH=${CTEST_SCRIPT_DIRECTORY}")
+
#############################################################################################
### disable test program builds
--
cgit v0.12
From c78f43b25eafc4f1b12f58f19397a236a2c246c5 Mon Sep 17 00:00:00 2001
From: Allen Byrne
Date: Mon, 20 Aug 2018 12:01:49 -0500
Subject: Fix quote
---
java/src/hdf/overview.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/src/hdf/overview.html b/java/src/hdf/overview.html
index a66e7b0..52dabf7 100644
--- a/java/src/hdf/overview.html
+++ b/java/src/hdf/overview.html
@@ -14,7 +14,7 @@ implemented in JHI5.
Java HD5 Interface (JHI5)
-
Note: The JHI5 does not support HDF4 or earlier.
|
--
cgit v0.12
From 732aae11c53fb63cdab58735604babbfd4d5db44 Mon Sep 17 00:00:00 2001
From: Allen Byrne
Date: Mon, 20 Aug 2018 15:07:19 -0500
Subject: HDFFV-10547 develop needs 1.12 default option
---
config/cmake/H5pubconf.h.in | 3 +++
1 file changed, 3 insertions(+)
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index 1d73bba..2ddb740 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -672,6 +672,9 @@
/* Define using v1.10 public API symbols by default */
#cmakedefine H5_USE_110_API_DEFAULT @H5_USE_110_API_DEFAULT@
+/* Define using v1.12 public API symbols by default */
+#cmakedefine H5_USE_112_API_DEFAULT @H5_USE_112_API_DEFAULT@
+
/* Define if a memory checking tool will be used on the library, to cause
library to be very picky about memory operations and also disable the
internal free list manager code. */
--
cgit v0.12