diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-10-29 12:48:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-29 12:48:52 (GMT) |
| commit | 68d810d0d28668b3845cd9186b8947b47f7454e0 (patch) | |
| tree | 3e674f005ef004449c29af38443506f6d74f8be8 /config | |
| parent | a931934fa793ceeb8334e365de225bfd1b67c92a (diff) | |
| download | hdf5-68d810d0d28668b3845cd9186b8947b47f7454e0.zip hdf5-68d810d0d28668b3845cd9186b8947b47f7454e0.tar.gz hdf5-68d810d0d28668b3845cd9186b8947b47f7454e0.tar.bz2 | |
1.10 Merge Consolidate VFD create list macro #1132 (#1140)
* Merge Consolidate VFD create list macro #1132
* Split dir create into separate macro
* fix VFD settings
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index b652d16..6403989 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -197,7 +197,7 @@ endif () # Header-check flags set in config/cmake_ext_mod/ConfigureChecks.cmake # ---------------------------------------------------------------------- option (HDF5_ENABLE_MIRROR_VFD "Build the Mirror Virtual File Driver" OFF) -if (H5FD_ENABLE_MIRROR_VFD) +if (HDF5_ENABLE_MIRROR_VFD) if ( ${HDF_PREFIX}_HAVE_NETINET_IN_H AND ${HDF_PREFIX}_HAVE_NETDB_H AND ${HDF_PREFIX}_HAVE_ARPA_INET_H AND diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index b3cf015..8b8b334 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -60,6 +60,7 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage) endif () endmacro () +# Initialize the list of VFDs to be used for testing and create a test folder for each VFD macro (H5_SET_VFD_LIST) set (VFD_LIST sec2 @@ -92,7 +93,10 @@ macro (H5_SET_VFD_LIST) if (H5_HAVE_WINDOWS) set (VFD_LIST ${VFD_LIST} windows) endif () +endmacro () +# Initialize the list of VFDs to be used for testing and create a test folder for each VFD +macro (H5_CREATE_VFD_DIR) foreach (vfdtest ${VFD_LIST}) file (MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/${vfdtest}") endforeach () |