diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-06-24 19:20:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-24 19:20:23 (GMT) |
| commit | fccbeb84dff6ddaee692269ff7494124ff806371 (patch) | |
| tree | fbd39c0a5da4f9a6f818d9f2a548c1fa4dc308e2 /tools/h5dump | |
| parent | 81452e366bd7b8d16744d09287c40d84f5221aad (diff) | |
| download | hdf5-fccbeb84dff6ddaee692269ff7494124ff806371.zip hdf5-fccbeb84dff6ddaee692269ff7494124ff806371.tar.gz hdf5-fccbeb84dff6ddaee692269ff7494124ff806371.tar.bz2 | |
Hdf5 1 8 Fix tools test (#797)
* Update supported platforms
* Merge PR#3 changes from develop
* # WARNING: head commit changed in the meantime
Merge gcc 10 diagnostics option from develop
Merge CMake changes from develop
Merge warnings from develop
Merge #318 OSX changes from develop
Merge tools changes from develop
Merge test macros from develop
* Format updates
* Fix missing semicolon and format fix
* Format update
* Correct actions, remove java option
* Update autotools build files
* Add testfiles
* Fix configure issue with make flags
* Init fapls to default
* Update generated files and fix h5repack id closure
* update format
* Merges from develop
#358 patches from vtk
#361 fix header guard spelling
* Merges from develop
#340 clang -Wformat-security warnings
#360 Fixed uninitialized warnings
header guard underscore cleanup
whitespace cleanup
tools sync
* format alignment
* initialize vars
* revert H5private change
* Merge #380 from develop
* Split format source and commit changes on repo push
* Change windows TS to use older VS.
* HDFFV-11229 merge dev changes for long double display in tools
* Committing clang-format changes
* Update unsupported types with precision
* Add "option" command for clang options
* CMake merges from develop h5cc scripts
* Updates from develop and printf formatters
* Committing clang-format changes
* Issue #669 remove version from pkgcfg filename
* remove version from h5cc script
* doxygen changes merged from develop
* Committing clang-format changes
* Enable fortran for gcc action
* Refactor Fortran CMake config tests and CMake test args
* Update code owners
* Add known problem
* Use only core library for testing dynamic plugins.
CMake uses H5_HAVE_DIRECT instead of DIRECT_VFD
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'tools/h5dump')
| -rw-r--r-- | tools/h5dump/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/h5dump/CMakeVFDTests.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt index 5194f22..ee24a1c 100644 --- a/tools/h5dump/CMakeLists.txt +++ b/tools/h5dump/CMakeLists.txt @@ -71,7 +71,7 @@ if (BUILD_TESTING) add_library (${H5DUMP_TOOL_PLUGIN_LIB_TARGET} SHARED dynlib_dump.c) target_include_directories (${H5DUMP_TOOL_PLUGIN_LIB_TARGET} PRIVATE "${HDF5_SRC_DIR};${HDF5_SRC_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>") TARGET_C_PROPERTIES (${H5DUMP_TOOL_PLUGIN_LIB_TARGET} SHARED) - target_link_libraries (${H5DUMP_TOOL_PLUGIN_LIB_TARGET} PRIVATE ${HDF5_TEST_LIBSH_TARGET}) + target_link_libraries (${H5DUMP_TOOL_PLUGIN_LIB_TARGET} PRIVATE ${HDF5_LIBSH_TARGET}) H5_SET_LIB_OPTIONS (${H5DUMP_TOOL_PLUGIN_LIB_TARGET} ${H5DUMP_TOOL_PLUGIN_LIB_NAME} SHARED "LIB") #----------------------------------------------------------------------------- diff --git a/tools/h5dump/CMakeVFDTests.cmake b/tools/h5dump/CMakeVFDTests.cmake index 014790f..01834b3 100644 --- a/tools/h5dump/CMakeVFDTests.cmake +++ b/tools/h5dump/CMakeVFDTests.cmake @@ -26,7 +26,7 @@ set (VFD_H5DUMP_LIST family ) -if (DIRECT_VFD) +if (H5_HAVE_DIRECT) set (VFD_H5DUMP_LIST ${VFD_H5DUMP_LIST} direct) endif () |