diff options
| author | jhendersonHDF <jhenderson@hdfgroup.org> | 2022-07-26 21:20:16 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-26 21:20:16 (GMT) |
| commit | 213eac2588369f75a11df6bb1788dde33c4b82e2 (patch) | |
| tree | cd2ca57125ea1555d331f2c3c7d08aef7b289064 /src | |
| parent | 96edaa304cbc771a36372725c395b9c2e1bd81dd (diff) | |
| download | hdf5-213eac2588369f75a11df6bb1788dde33c4b82e2.zip hdf5-213eac2588369f75a11df6bb1788dde33c4b82e2.tar.gz hdf5-213eac2588369f75a11df6bb1788dde33c4b82e2.tar.bz2 | |
Subfiling VFD misc fixes (#1938)
* Remove generated file h5fuse.sh
* Link pthreads library when Subfiling VFD is built
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9818004..3b98874 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1235,7 +1235,7 @@ if (NOT ONLY_SHARED_LIBS) ) if (NOT WIN32) target_link_libraries (${HDF5_LIB_TARGET} - PRIVATE $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:Threads::Threads> + PRIVATE $<$<OR:$<BOOL:${HDF5_ENABLE_THREADSAFE}>,$<BOOL:${HDF5_ENABLE_SUBFILING_VFD}>>:Threads::Threads> ) endif () set_global_variable (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET}) @@ -1272,7 +1272,8 @@ if (BUILD_SHARED_LIBS) ) TARGET_C_PROPERTIES (${HDF5_LIBSH_TARGET} SHARED) target_link_libraries (${HDF5_LIBSH_TARGET} - PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>" $<$<BOOL:${HDF5_ENABLE_THREADSAFE}>:Threads::Threads> + PRIVATE ${LINK_LIBS} ${LINK_COMP_LIBS} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>" + $<$<OR:$<BOOL:${HDF5_ENABLE_THREADSAFE}>,$<BOOL:${HDF5_ENABLE_SUBFILING_VFD}>>:Threads::Threads> PUBLIC $<$<NOT:$<PLATFORM_ID:Windows>>:${CMAKE_DL_LIBS}> ) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_LIBSH_TARGET}") |