h5vol: Restructure HDF5 VOL build

ornladios · Dec 29, 2020 · d41a8b9 · d41a8b9
1 parent b6f655f
commit d41a8b9
Show file tree

Hide file tree

Showing 20 changed files with 58 additions and 865 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -147,7 +147,7 @@ if(ADIOS2_HAVE_MPI)
 endif()
 
 set(ADIOS2_CONFIG_OPTS
-    Blosc BZip2 ZFP SZ MGARD PNG MPI DataMan Table SSC SST DataSpaces ZeroMQ HDF5 IME Python Fortran SysVShMem Profiling Endian_Reverse
+    Blosc BZip2 ZFP SZ MGARD PNG MPI DataMan Table SSC SST DataSpaces ZeroMQ HDF5 HDF5_VOL IME Python Fortran SysVShMem Profiling Endian_Reverse
 )
 GenerateADIOSHeaderConfig(${ADIOS2_CONFIG_OPTS})
 configure_file(
@@ -318,6 +318,7 @@ foreach(opt IN LISTS ADIOS2_CONFIG_OPTS)
     message("${label}: OFF")
   endif()
 endforeach()
+
 if (ADIOS2_HAVE_SST AND ADIOS2_SST_HAVE_LIBFABRIC) 
 message("    RDMA Transport for Staging: Available")
 else()

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -10,11 +10,6 @@ add_subdirectory(useCases)
 
 if(ADIOS2_HAVE_MPI)
   add_subdirectory(heatTransfer)
-  if(ADIOS2_HAVE_HDF5)
-    if(NOT (HDF5_VERSION VERSION_LESS 1.11))
-       add_subdirectory(h5vol)	   
-    endif()
-  endif()
 endif()
 
 if(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL)

diff --git a/examples/h5vol/CMakeLists.txt b/examples/h5vol/CMakeLists.txt