diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2024-03-04 17:28:46 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2024-03-04 17:28:46 (GMT) |
| commit | a846ae561f5b34c905ca40093232fb8e709dfa5f (patch) | |
| tree | 7461a032a090524ff38f4f9ae77305efce503dcf /tools/src/h5ls | |
| parent | 51e1cf5c48c47f43fbc82ca4e6392d81303a47df (diff) | |
| parent | 7ab17e25c6d7258b66282ea8377e9b1a43efb862 (diff) | |
| download | hdf5-a846ae561f5b34c905ca40093232fb8e709dfa5f.zip hdf5-a846ae561f5b34c905ca40093232fb8e709dfa5f.tar.gz hdf5-a846ae561f5b34c905ca40093232fb8e709dfa5f.tar.bz2 | |
Merge branch 'develop' into feature/new_datatypes
Diffstat (limited to 'tools/src/h5ls')
| -rw-r--r-- | tools/src/h5ls/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | tools/src/h5ls/h5ls.c | 7 |
2 files changed, 17 insertions, 28 deletions
diff --git a/tools/src/h5ls/CMakeLists.txt b/tools/src/h5ls/CMakeLists.txt index 67122a1..f8f7fff 100644 --- a/tools/src/h5ls/CMakeLists.txt +++ b/tools/src/h5ls/CMakeLists.txt @@ -4,41 +4,27 @@ project (HDF5_TOOLS_SRC_H5LS C) #----------------------------------------------------------------------------- # Add the h5ls executable #----------------------------------------------------------------------------- -if (BUILD_STATIC_LIBS) - add_executable (h5ls ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c) - target_include_directories (h5ls PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") - target_compile_options(h5ls PRIVATE "${HDF5_CMAKE_C_FLAGS}") - #target_compile_definitions(h5ls PRIVATE H5_TOOLS_DEBUG) +add_executable (h5ls ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c) +target_include_directories (h5ls PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") +target_compile_options(h5ls PRIVATE "${HDF5_CMAKE_C_FLAGS}") +#target_compile_definitions(h5ls PRIVATE H5_TOOLS_DEBUG) +if (HDF5_BUILD_STATIC_TOOLS) TARGET_C_PROPERTIES (h5ls STATIC) target_link_libraries (h5ls PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) - set_target_properties (h5ls PROPERTIES FOLDER tools) - set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls") - - set (H5_DEP_EXECUTABLES h5ls) +else () + TARGET_C_PROPERTIES (h5ls SHARED) + target_link_libraries (h5ls PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) endif () +set_target_properties (h5ls PROPERTIES FOLDER tools) +set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls") -if (BUILD_SHARED_LIBS) - add_executable (h5ls-shared ${HDF5_TOOLS_SRC_H5LS_SOURCE_DIR}/h5ls.c) - target_include_directories (h5ls-shared PRIVATE "${HDF5_TOOLS_ROOT_DIR}/lib;${HDF5_SRC_INCLUDE_DIRS};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") - target_compile_options(h5ls-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}") - #target_compile_definitions(h5ls-shared PRIVATE H5_TOOLS_DEBUG) - TARGET_C_PROPERTIES (h5ls-shared SHARED) - target_link_libraries (h5ls-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) - set_target_properties (h5ls-shared PROPERTIES FOLDER tools) - set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5ls-shared") - - set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5ls-shared) -endif () +set (H5_DEP_EXECUTABLES h5ls) #----------------------------------------------------------------------------- # Add Target to clang-format #----------------------------------------------------------------------------- if (HDF5_ENABLE_FORMATTERS) - if (BUILD_STATIC_LIBS) - clang_format (HDF5_H5LS_SRC_FORMAT h5ls) - else () - clang_format (HDF5_H5LS_SRC_FORMAT h5ls-shared) - endif () + clang_format (HDF5_H5LS_SRC_FORMAT h5ls) endif () ############################################################################## diff --git a/tools/src/h5ls/h5ls.c b/tools/src/h5ls/h5ls.c index bc0781c..a5c1aa5 100644 --- a/tools/src/h5ls/h5ls.c +++ b/tools/src/h5ls/h5ls.c @@ -2869,7 +2869,8 @@ main(int argc, char *argv[]) vfd_info.info = &ros3_fa; #else - fprintf(rawerrorstream, "Error: Read-Only S3 VFD is not enabled\n\n"); + fprintf(rawerrorstream, "Error: Read-Only S3 VFD is not available unless enabled when HDF5 is " + "configured and built.\n\n"); usage(); leave(EXIT_FAILURE); #endif @@ -2892,7 +2893,9 @@ main(int argc, char *argv[]) vfd_info.info = &hdfs_fa; #else - fprintf(rawerrorstream, "Error: The HDFS VFD is not enabled\n\n"); + fprintf( + rawerrorstream, + "Error: The HDFS VFD is not available unless enabled when HDF5 is configured and built.\n\n"); usage(); leave(EXIT_FAILURE); #endif |