-
-
Notifications
You must be signed in to change notification settings - Fork 265
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* 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
- Loading branch information
1 parent
144bec3
commit 17a5a1a
Showing
37 changed files
with
173 additions
and
3,293 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
cmake_minimum_required (VERSION 3.18) | ||
project (HDF5_H5FD_SUBFILING C) | ||
|
||
# Sanity checking | ||
if (NOT H5FD_HDRS) | ||
message (FATAL_ERROR "internal configure error - H5FD_HDRS not set") | ||
endif () | ||
if (NOT H5FD_SUBFILING_DIR) | ||
message (FATAL_ERROR "internal configure error - H5FD_SUBFILING_DIR not set") | ||
endif () | ||
|
||
if (HDF5_ENABLE_SUBFILING_VFD) | ||
# Sanity checking | ||
if (NOT H5FD_SOURCES) | ||
message (FATAL_ERROR "internal configure error - H5FD_SOURCES not set") | ||
endif () | ||
if (NOT H5FD_SUBFILING_MERCURY_DIR) | ||
message (FATAL_ERROR "internal configure error - H5FD_SUBFILING_MERCURY_DIR not set") | ||
endif () | ||
|
||
# Add mercury util sources to Subfiling VFD sources | ||
set (MERCURY_UTIL_SOURCES | ||
${H5FD_SUBFILING_MERCURY_DIR}/mercury_thread.c | ||
${H5FD_SUBFILING_MERCURY_DIR}/mercury_thread_condition.c | ||
${H5FD_SUBFILING_MERCURY_DIR}/mercury_thread_pool.c | ||
${H5FD_SUBFILING_MERCURY_DIR}/mercury_thread_mutex.c | ||
) | ||
|
||
set (HDF5_H5FD_SUBFILING_SOURCES | ||
${H5FD_SUBFILING_DIR}/H5FDioc.c | ||
${H5FD_SUBFILING_DIR}/H5FDioc_int.c | ||
${H5FD_SUBFILING_DIR}/H5FDioc_threads.c | ||
${H5FD_SUBFILING_DIR}/H5FDsubfiling.c | ||
${H5FD_SUBFILING_DIR}/H5FDsubfile_int.c | ||
${H5FD_SUBFILING_DIR}/H5subfiling_common.c | ||
${MERCURY_UTIL_SOURCES} | ||
) | ||
|
||
# Add Subfiling VFD sources to HDF5 library's H5FD sources | ||
set (H5FD_SOURCES | ||
${H5FD_SOURCES} | ||
${HDF5_H5FD_SUBFILING_SOURCES} | ||
PARENT_SCOPE | ||
) | ||
endif () | ||
|
||
# Add Subfiling VFD public headers to HDF5 library's | ||
# public H5FD headers, even if the Subfiling VFD isn't | ||
# enabled and built | ||
set (HDF5_H5FD_SUBFILING_HEADERS | ||
${H5FD_SUBFILING_DIR}/H5FDsubfiling.h | ||
${H5FD_SUBFILING_DIR}/H5FDioc.h | ||
) | ||
|
||
# Add Subfiling VFD public headers to HDF5 library's public H5FD headers | ||
set (H5FD_HDRS | ||
${H5FD_HDRS} | ||
${HDF5_H5FD_SUBFILING_HEADERS} | ||
PARENT_SCOPE | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.