diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-08-20 23:08:11 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-08-20 23:08:11 (GMT) |
| commit | 45603a6cdf6983181f52b5133a913c86f40ab6f6 (patch) | |
| tree | 15bb8c1a14c61fe54bae9d3de5b94205f18e5f7a | |
| parent | 91e9ba76c9aaa3ee4264e2e51fa177177a19051f (diff) | |
| parent | 732aae11c53fb63cdab58735604babbfd4d5db44 (diff) | |
| download | hdf5-45603a6cdf6983181f52b5133a913c86f40ab6f6.zip hdf5-45603a6cdf6983181f52b5133a913c86f40ab6f6.tar.gz hdf5-45603a6cdf6983181f52b5133a913c86f40ab6f6.tar.bz2 | |
Merge pull request #1211 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '732aae11c53fb63cdab58735604babbfd4d5db44':
HDFFV-10547 develop needs 1.12 default option
Fix quote
HDFFV-10547 requires updated examples version
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 3 | ||||
| -rwxr-xr-x | config/cmake/scripts/HDF5options.cmake | 3 | ||||
| -rw-r--r-- | java/src/hdf/overview.html | 2 |
3 files changed, 7 insertions, 1 deletions
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. */ 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 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.</p> <table style="width:71%;text-align:center;background-color:#dbeaf5" border="1"> <caption>Java HD5 Interface (JHI5)</caption> <tr> -<td style="text-align:center;> +<td style="text-align:center;"> Note: The JHI5 does not support HDF4 or earlier. </td> </tr> |