diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 18:28:33 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 18:28:33 (GMT) |
| commit | 1fc1b09bf39c4cfbcb907209a27619e4d1b7bf26 (patch) | |
| tree | 9a9a6b5ebddf128c5ef0f8148491ae98e9af913e /tools | |
| parent | b003ff5b1b35bd87444a22c4be2ea92b20a3d1e4 (diff) | |
| download | hdf5-1fc1b09bf39c4cfbcb907209a27619e4d1b7bf26.zip hdf5-1fc1b09bf39c4cfbcb907209a27619e4d1b7bf26.tar.gz hdf5-1fc1b09bf39c4cfbcb907209a27619e4d1b7bf26.tar.bz2 | |
Fix issues found with ONLY_SHARED_LIBS option
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lib/h5tools.h | 28 | ||||
| -rw-r--r-- | tools/test/h5ls/CMakeTests.cmake | 2 | ||||
| -rw-r--r-- | tools/test/misc/CMakeTestsMkgrp.cmake | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/tools/lib/h5tools.h b/tools/lib/h5tools.h index 11ba612..dad4af7 100644 --- a/tools/lib/h5tools.h +++ b/tools/lib/h5tools.h @@ -504,6 +504,19 @@ typedef struct h5tool_format_t { } h5tool_format_t; +typedef struct subset_d { + hsize_t *data; + unsigned int len; +} subset_d; + +/* a structure to hold the subsetting particulars for a dataset */ +struct subset_t { + subset_d start; + subset_d stride; + subset_d count; + subset_d block; +}; + typedef struct h5tools_context_t { size_t cur_column; /* current column for output */ size_t cur_elmt; /* current element/output line */ @@ -523,22 +536,9 @@ typedef struct h5tools_context_t { const struct H5LD_memb_t * const *cmpd_listv; /* h5watch: vector containing info about the list of compound fields to be printed */ struct subset_t *sset; /* subsetting parameters */ int display_index; /* */ - int display_char; /* */ + int display_char; /* */ } h5tools_context_t; -typedef struct subset_d { - hsize_t *data; - unsigned int len; -} subset_d; - -/* a structure to hold the subsetting particulars for a dataset */ -struct subset_t { - subset_d start; - subset_d stride; - subset_d count; - subset_d block; -}; - /* The following include, h5tools_str.h, must be after the * above stucts are defined. There is a dependency in the following * include that hasn't been identified yet. */ diff --git a/tools/test/h5ls/CMakeTests.cmake b/tools/test/h5ls/CMakeTests.cmake index 2f3f3ab..7ff17ff 100644 --- a/tools/test/h5ls/CMakeTests.cmake +++ b/tools/test/h5ls/CMakeTests.cmake @@ -168,7 +168,7 @@ macro (ADD_H5_ERR_TEST resultfile resultcode) # If using memchecker add tests without using scripts if (HDF5_ENABLE_USING_MEMCHECKER) - add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls> ${ARGN}) + add_test (NAME H5LS-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5ls${tgt_ext}> ${ARGN}) set_tests_properties (H5LS-${resultfile} PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") if (${resultcode} EQUAL 1) set_tests_properties (H5LS-${resultfile} PROPERTIES WILL_FAIL "true") diff --git a/tools/test/misc/CMakeTestsMkgrp.cmake b/tools/test/misc/CMakeTestsMkgrp.cmake index 11fa3f2..c947e0e 100644 --- a/tools/test/misc/CMakeTestsMkgrp.cmake +++ b/tools/test/misc/CMakeTestsMkgrp.cmake @@ -96,7 +96,7 @@ macro (ADD_H5_CMP resultfile resultcode) if (HDF5_ENABLE_USING_MEMCHECKER) - add_test (NAME H5MKGRP_CMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5mkgrp> ${ARGN}) + add_test (NAME H5MKGRP_CMP-${resultfile} COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:h5mkgrp${tgt_ext}> ${ARGN}) else () add_test ( NAME H5MKGRP_CMP-${resultfile}-clear-objects |