diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2023-07-27 19:11:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-27 19:11:28 (GMT) |
| commit | 17a5a1a37ccc851ca9123b2921fbae15c4814edf (patch) | |
| tree | bdc30fe342f691bd8c0d2454a81a195b4d31cef9 /config | |
| parent | 144bec301c874554cdd8651148dede93fd5279dc (diff) | |
| download | hdf5-17a5a1a37ccc851ca9123b2921fbae15c4814edf.zip hdf5-17a5a1a37ccc851ca9123b2921fbae15c4814edf.tar.gz hdf5-17a5a1a37ccc851ca9123b2921fbae15c4814edf.tar.bz2 | |
Subfiling VFD source cleanup (#3241) (#3290)
* Subfiling VFD source cleanup (#3241)
* Subfiling VFD source cleanup
Modularize Subfiling CMake code into separate CMakeLists.txt file
Update Mercury util code to latest version and update Copyright
Generate mercury_util_config.h header file instead of using
pre-generated file
Remove unnecessary Mercury functionality
Fix minor warning in Subfiling VFD code
* Remove Mercury headers from Autotools publicly-distributed header list
* Fix CMake builds when Subfiling VFD isn't enabled (#3250)
* Fix CMake builds when Subfiling VFD isn't enabled
* Add Subfiling VFD entry to hdf5-config.cmake.in
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 9 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 9 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.in | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index b768928..01fe139 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -682,6 +682,15 @@ if (MINGW OR NOT WINDOWS) list (APPEND LINK_LIBS posix4) endif () endif () + +# Check for clock_gettime() CLOCK_MONOTONIC_COARSE +set (CMAKE_EXTRA_INCLUDE_FILES time.h) +check_type_size(CLOCK_MONOTONIC_COARSE CLOCK_MONOTONIC_COARSE_SIZE) +if (HAVE_CLOCK_MONOTONIC_COARSE_SIZE) + set (${HDF_PREFIX}_HAVE_CLOCK_MONOTONIC_COARSE 1) +endif () +unset (CMAKE_EXTRA_INCLUDE_FILES) + #----------------------------------------------------------------------------- #----------------------------------------------------------------------------- diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index c1b051f..37e8746 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -101,6 +101,9 @@ /* Define to 1 if you have the `clock_gettime' function. */ #cmakedefine H5_HAVE_CLOCK_GETTIME @H5_HAVE_CLOCK_GETTIME@ +/* Define to 1 if CLOCK_MONOTONIC_COARSE is available */ +#cmakedefine H5_HAVE_CLOCK_MONOTONIC_COARSE @H5_HAVE_CLOCK_MONOTONIC_COARSE@ + /* Define if the function stack tracing code is to be compiled in */ #cmakedefine H5_HAVE_CODESTACK @H5_HAVE_CODESTACK@ @@ -255,6 +258,12 @@ /* Define to 1 if you have the <pthread.h> header file. */ #cmakedefine H5_HAVE_PTHREAD_H @H5_HAVE_PTHREAD_H@ +/* Define to 1 if 'pthread_condattr_setclock()' is available */ +#cmakedefine H5_HAVE_PTHREAD_CONDATTR_SETCLOCK @H5_HAVE_PTHREAD_CONDATTR_SETCLOCK@ + +/* Define to 1 if PTHREAD_MUTEX_ADAPTIVE_NP is available */ +#cmakedefine H5_HAVE_PTHREAD_MUTEX_ADAPTIVE_NP @H5_HAVE_PTHREAD_MUTEX_ADAPTIVE_NP@ + /* Define to 1 if you have the <pwd.h> header file. */ #cmakedefine H5_HAVE_PWD_H @H5_HAVE_PWD_H@ diff --git a/config/cmake/hdf5-config.cmake.in b/config/cmake/hdf5-config.cmake.in index 11c4af3..afcaeae 100644 --- a/config/cmake/hdf5-config.cmake.in +++ b/config/cmake/hdf5-config.cmake.in @@ -44,6 +44,7 @@ set (${HDF5_PACKAGE_NAME}_ENABLE_PLUGIN_SUPPORT @HDF5_ENABLE_PLUGIN_SUPPORT@) set (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@) set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@) set (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@) +set (${HDF5_PACKAGE_NAME}_ENABLE_SUBFILING_VFD @HDF5_ENABLE_SUBFILING_VFD@) set (${HDF5_PACKAGE_NAME}_BUILD_SHARED_LIBS @H5_ENABLE_SHARED_LIB@) set (${HDF5_PACKAGE_NAME}_BUILD_STATIC_LIBS @H5_ENABLE_STATIC_LIB@) set (${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS @HDF5_PACKAGE_EXTLIBS@) |