diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-10-25 14:27:44 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-25 14:27:44 (GMT) |
| commit | 9d296c30e57105eedd3fd747c32d4ec1c9c2494d (patch) | |
| tree | cf9729e211bc34514cb06041e0fdd27a97d287c6 /config/cmake | |
| parent | 8124798cba9292ecdbf4211e3eecbdd40b2bdda2 (diff) | |
| download | hdf5-9d296c30e57105eedd3fd747c32d4ec1c9c2494d.zip hdf5-9d296c30e57105eedd3fd747c32d4ec1c9c2494d.tar.gz hdf5-9d296c30e57105eedd3fd747c32d4ec1c9c2494d.tar.bz2 | |
1.10 Merge Move test utilities to utils/test folder #1109 (#1111)
* Merge Move test utilities to utils/test folder #1109
* Merge Correct shell tests and c++ flag warning
* Fix typo
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 37 | ||||
| -rw-r--r-- | config/cmake/HDFCXXCompilerFlags.cmake | 4 |
2 files changed, 39 insertions, 2 deletions
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index 090524a..b3cf015 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -58,5 +58,42 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage) endif () endif () endif () +endmacro () + +macro (H5_SET_VFD_LIST) + set (VFD_LIST + sec2 + stdio + core + core_paged + split + multi + family + splitter + #log - log VFD currently has file space allocation bugs + ) + + if (H5_HAVE_DIRECT) + set (VFD_LIST ${VFD_LIST} direct) + endif () + if (H5_HAVE_PARALLEL) + # MPI I/O VFD is currently incompatible with too many tests in the VFD test set + # set (VFD_LIST ${VFD_LIST} mpio) + endif () + if (H5_HAVE_MIRROR_VFD) + set (VFD_LIST ${VFD_LIST} mirror) + endif () + if (H5_HAVE_ROS3_VFD) + set (VFD_LIST ${VFD_LIST} ros3) + endif () + if (H5_HAVE_LIBHDFS) + set (VFD_LIST ${VFD_LIST} hdfs) + endif () + if (H5_HAVE_WINDOWS) + set (VFD_LIST ${VFD_LIST} windows) + endif () + foreach (vfdtest ${VFD_LIST}) + file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}") + endforeach () endmacro () diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake index f992aa0..0403834 100644 --- a/config/cmake/HDFCXXCompilerFlags.cmake +++ b/config/cmake/HDFCXXCompilerFlags.cmake @@ -179,9 +179,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-4.8") if (HDF5_ENABLE_DEV_WARNINGS) # Use the C warnings as CXX warnings are the same - ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-4.8") + ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-developer-4.8") else () - ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-developer-4.8") + ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/no-cxx-developer-4.8") endif () endif () |