diff options
Diffstat (limited to 'tools/src/h5dump')
| -rw-r--r-- | tools/src/h5dump/CMakeLists.txt | 62 | ||||
| -rw-r--r-- | tools/src/h5dump/h5dump.c | 5 |
2 files changed, 23 insertions, 44 deletions
diff --git a/tools/src/h5dump/CMakeLists.txt b/tools/src/h5dump/CMakeLists.txt index 3284949..3cdffa2 100644 --- a/tools/src/h5dump/CMakeLists.txt +++ b/tools/src/h5dump/CMakeLists.txt @@ -4,57 +4,35 @@ project (HDF5_TOOLS_SRC_H5DUMP C) # -------------------------------------------------------------------- # Add the h5dump executables # -------------------------------------------------------------------- -if (BUILD_STATIC_LIBS) - add_executable (h5dump - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.c - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.h - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_defines.h - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_extern.h - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.h - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.h - ) - target_include_directories (h5dump 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(h5dump PRIVATE "${HDF5_CMAKE_C_FLAGS}") +add_executable (h5dump + ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.c + ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c + ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c + ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.h + ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_defines.h + ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_extern.h + ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.h + ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.h +) +target_include_directories (h5dump 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(h5dump PRIVATE "${HDF5_CMAKE_C_FLAGS}") +if (HDF5_BUILD_STATIC_TOOLS) TARGET_C_PROPERTIES (h5dump STATIC) target_link_libraries (h5dump PRIVATE ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET}) - set_target_properties (h5dump PROPERTIES FOLDER tools) - set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump") - - set (H5_DEP_EXECUTABLES h5dump) +else () + TARGET_C_PROPERTIES (h5dump SHARED) + target_link_libraries (h5dump PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) endif () +set_target_properties (h5dump PROPERTIES FOLDER tools) +set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump") -if (BUILD_SHARED_LIBS) - add_executable (h5dump-shared - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.c - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.c - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.c - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump.h - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_defines.h - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_extern.h - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_ddl.h - ${HDF5_TOOLS_SRC_H5DUMP_SOURCE_DIR}/h5dump_xml.h - ) - target_include_directories (h5dump-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(h5dump-shared PRIVATE "${HDF5_CMAKE_C_FLAGS}") - TARGET_C_PROPERTIES (h5dump-shared SHARED) - target_link_libraries (h5dump-shared PRIVATE ${HDF5_TOOLS_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) - set_target_properties (h5dump-shared PROPERTIES FOLDER tools) - set_global_variable (HDF5_UTILS_TO_EXPORT "${HDF5_UTILS_TO_EXPORT};h5dump-shared") - - set (H5_DEP_EXECUTABLES ${H5_DEP_EXECUTABLES} h5dump-shared) -endif () +set (H5_DEP_EXECUTABLES h5dump) #----------------------------------------------------------------------------- # Add Target to clang-format #----------------------------------------------------------------------------- if (HDF5_ENABLE_FORMATTERS) - if (BUILD_STATIC_LIBS) - clang_format (HDF5_H5DUMP_SRC_FORMAT h5dump) - else () - clang_format (HDF5_H5DUMP_SRC_FORMAT h5dump-shared) - endif () + clang_format (HDF5_H5DUMP_SRC_FORMAT h5dump) endif () ############################################################################## diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c index 8f2c406..63c2102 100644 --- a/tools/src/h5dump/h5dump.c +++ b/tools/src/h5dump/h5dump.c @@ -1169,7 +1169,8 @@ end_collect: vfd_info_g.info = &ros3_fa_g; #else - error_msg("Read-Only S3 VFD not enabled.\n"); + error_msg( + "Read-Only S3 VFD is not available unless enabled when HDF5 is configured and built.\n"); h5tools_setstatus(EXIT_FAILURE); goto done; #endif @@ -1188,7 +1189,7 @@ end_collect: vfd_info_g.info = &hdfs_fa_g; #else - error_msg("HDFS VFD not enabled.\n"); + error_msg("HDFS VFD is not available unless enabled when HDF5 is configured and built.\n"); h5tools_setstatus(EXIT_FAILURE); goto done; #endif |