mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-06 17:20:42 +08:00
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
This commit is contained in:
commit
45603a6cdf
@ -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. */
|
||||
|
@ -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
|
||||
|
||||
|
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user