diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-10-22 15:03:51 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 15:03:51 (GMT) |
| commit | 223b3765293852c94b84e5b40c7585ecc5021eaa (patch) | |
| tree | 177ff342ca25f489311a3d84bfcb0a8cb5a105b5 /tools | |
| parent | e5e108dbd56fc1b871915d3de64fe85a6fc9b175 (diff) | |
| download | hdf5-223b3765293852c94b84e5b40c7585ecc5021eaa.zip hdf5-223b3765293852c94b84e5b40c7585ecc5021eaa.tar.gz hdf5-223b3765293852c94b84e5b40c7585ecc5021eaa.tar.bz2 | |
1.8 Merge cmake and flag changes from develop (#1119)
* Merge cmake and flag changes from develop
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/h5dump/CMakeVFDTests.cmake | 19 | ||||
| -rw-r--r-- | tools/h5repack/CMakeVFDTests.cmake | 14 |
3 files changed, 5 insertions, 30 deletions
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index c0c7036..ad4ed99 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -15,7 +15,7 @@ add_subdirectory (misc) #-- Add the h5import and test executables add_subdirectory (h5import) -#-- h5Repack executables +#-- h5repack executables add_subdirectory (h5repack) #-- Add the h5dump and test executables diff --git a/tools/h5dump/CMakeVFDTests.cmake b/tools/h5dump/CMakeVFDTests.cmake index 01834b3..6a70b85 100644 --- a/tools/h5dump/CMakeVFDTests.cmake +++ b/tools/h5dump/CMakeVFDTests.cmake @@ -16,19 +16,7 @@ ############################################################################## ############################################################################## -set (VFD_H5DUMP_LIST - sec2 - stdio - core - core_paged - split - multi - family -) - -if (H5_HAVE_DIRECT) - set (VFD_H5DUMP_LIST ${VFD_H5DUMP_LIST} direct) -endif () +H5_SET_VFD_LIST() # -------------------------------------------------------------------- # Copy all the HDF5 files from the source directory into the test directory @@ -37,8 +25,7 @@ set (HDF5_VFD_H5DUMP_FILES packedbits ) -foreach (vfdtest ${VFD_H5DUMP_LIST}) - file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}") +foreach (vfdtest ${VFD_LIST}) foreach (h5_tfile ${HDF5_VFD_H5DUMP_FILES}) HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.h5" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.h5" "HDF5_VFD_H5DUMP_files") HDFTEST_COPY_FILE("${HDF5_TOOLS_DIR}/testfiles/${h5_tfile}.ddl" "${PROJECT_BINARY_DIR}/${vfdtest}/${h5_tfile}.ddl" "HDF5_VFD_H5DUMP_files") @@ -79,7 +66,7 @@ endmacro () ############################################################################## # Run test with different Virtual File Driver -foreach (vfd ${VFD_H5DUMP_LIST}) +foreach (vfd ${VFD_LIST}) # test for signed/unsigned datasets ADD_VFD_H5DUMP_TEST (${vfd} packedbits 0 --enable-error-stack packedbits.h5) endforeach () diff --git a/tools/h5repack/CMakeVFDTests.cmake b/tools/h5repack/CMakeVFDTests.cmake index 7eea4cc..78d752c 100644 --- a/tools/h5repack/CMakeVFDTests.cmake +++ b/tools/h5repack/CMakeVFDTests.cmake @@ -16,18 +16,7 @@ ############################################################################## ############################################################################## -set (VFD_LIST - sec2 - stdio - core - split - multi - family -) - -if (H5_HAVE_DIRECT) - set (VFD_LIST ${VFD_LIST} direct) -endif () +H5_SET_VFD_LIST() ############################################################################## ############################################################################## @@ -37,7 +26,6 @@ endif () macro (ADD_VFD_TEST vfdname resultcode) if (NOT HDF5_ENABLE_USING_MEMCHECKER) - file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdname}") add_test ( NAME H5REPACK-${vfdname}-h5repacktest-clear-objects COMMAND ${CMAKE_COMMAND} -E remove |