diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-03-18 04:21:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 04:21:31 (GMT) |
| commit | ebdbd503ca1d1a50701937542c6a9e66a3885458 (patch) | |
| tree | 622a3fefca8af417c946ae5e2447fee95c374fbe | |
| parent | a01f570f97287295e960633feab4c3908ea318d7 (diff) | |
| download | hdf5-ebdbd503ca1d1a50701937542c6a9e66a3885458.zip hdf5-ebdbd503ca1d1a50701937542c6a9e66a3885458.tar.gz hdf5-ebdbd503ca1d1a50701937542c6a9e66a3885458.tar.bz2 | |
Allow parallel thread-safe builds (#2584)
* Allow parallel + thread-safe builds
No longer require the "enable unsupported" option to build this
configuration in CMake and the Autotools.
* Add a release note for parallel thread-safety
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 9 |
3 files changed, 9 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3230a29..eee74cc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -821,15 +821,6 @@ if (HDF5_ENABLE_THREADSAFE) message (VERBOSE " **** thread-safety option will not be used building static library **** ") endif () endif () - if (HDF5_ENABLE_PARALLEL) - if (NOT ALLOW_UNSUPPORTED) - message (FATAL_ERROR " **** parallel and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ") - else () - if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") - message (VERBOSE " **** Allowing unsupported parallel and thread-safety options **** ") - endif () - endif () - endif () if (HDF5_BUILD_FORTRAN) if (NOT ALLOW_UNSUPPORTED) message (FATAL_ERROR " **** Fortran and thread-safety options are not supported, override with ALLOW_UNSUPPORTED option **** ") diff --git a/configure.ac b/configure.ac index cd8ba15..c097f26 100644 --- a/configure.ac +++ b/configure.ac @@ -2858,14 +2858,6 @@ if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then fi fi -## --enable-parallel is also incompatible with --enable-threadsafe, unless -## --enable-unsupported has been specified on the configure line. -if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then - if test "X${THREADSAFE}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then - AC_MSG_ERROR([--enable-threadsafe and --enable-parallel flags are incompatible. Use --enable-unsupported to override this error.]) - fi -fi - AC_MSG_CHECKING([for parallel support files]) case "X-$enable_parallel" in X-|X-no|X-none) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index f08a7a3..688116d 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -49,6 +49,15 @@ New Features Configuration: ------------- + - Allow parallel and threadsafe to be built + + In the past, we required --enable-unsupported (Autotools) or + ALLOW_UNSUPPORTED (CMake) in order to build the parallel library with + thread-safety support. The parallel, thread-safe library can now be + built without these options. + + (DER - 2023/03/17) + - Added new option to build libaec and zlib inline with CMake. Using the CMake FetchContent module, the external filters can populate |