diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-07-03 20:31:40 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-07-03 20:31:40 (GMT) |
| commit | 2b2876ac57a1901537d7c2732eac81f7434d332d (patch) | |
| tree | 704f0445e58c36811366c7f78e1e074ea6efaf43 | |
| parent | 1c7420d1e3dfc7b6c957410925cae2ce726ead6f (diff) | |
| parent | 7b9f24603f980a73d43194c66a01a62aee16b2e8 (diff) | |
| download | hdf5-2b2876ac57a1901537d7c2732eac81f7434d332d.zip hdf5-2b2876ac57a1901537d7c2732eac81f7434d332d.tar.gz hdf5-2b2876ac57a1901537d7c2732eac81f7434d332d.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '7b9f24603f980a73d43194c66a01a62aee16b2e8':
Fixed Build HDF Tests name in CMake's libhdf5 settings
Fixed libhdf5 settings file for both autotools & CMake
| -rw-r--r-- | config/cmake/libhdf5.settings.cmake.in | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/libhdf5.settings.in | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in index 9e91ac0..2117f3b 100644 --- a/config/cmake/libhdf5.settings.cmake.in +++ b/config/cmake/libhdf5.settings.cmake.in @@ -68,6 +68,8 @@ Features: Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@ Large Parallel I/O: @LARGE_PARALLEL_IO@ High-level library: @HDF5_BUILD_HL_LIB@ + Build HDF5 Tests: @BUILD_TESTING@ + Build HDF5 Tools: @HDF5_BUILD_TOOLS@ Threadsafety: @HDF5_ENABLE_THREADSAFE@ Default API mapping: @DEFAULT_API_VERSION@ With deprecated public symbols: @HDF5_ENABLE_DEPRECATED_SYMBOLS@ diff --git a/configure.ac b/configure.ac index 33b3251..d1d209f 100644 --- a/configure.ac +++ b/configure.ac @@ -3649,7 +3649,7 @@ AC_CONFIG_COMMANDS([.classes], [], [$MKDIR_P java/src/.classes; AC_OUTPUT -chmod 755 src/h5cc +chmod 755 bin/h5cc if test "X$HDF_CXX" = "Xyes"; then chmod 755 c++/src/h5c++ fi diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index 37957a2..f856ebc 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -72,7 +72,7 @@ Parallel Filtered Dataset Writes: @PARALLEL_FILTERED_WRITES@ Large Parallel I/O: @LARGE_PARALLEL_IO@ High-level library: @HDF5_HL@ Build HDF5 Tests: @HDF5_TESTS@ - Build HDF5 TOOLS: @HDF5_TOOLS@ + Build HDF5 Tools: @HDF5_TOOLS@ Threadsafety: @THREADSAFE@ Default API mapping: @DEFAULT_API_VERSION@ With deprecated public symbols: @DEPRECATED_SYMBOLS@ |