cmake: moved logic to enable h5vol to detectoptions.cmake

CMakeLists.txt

@@ -157,6 +157,7 @@ adios_option(SST        "Enable support for SST" AUTO)
 adios_option(BP5        "Enable support for BP5" AUTO)
 adios_option(ZeroMQ     "Enable support for ZeroMQ" AUTO)
 adios_option(HDF5       "Enable support for the HDF5 engine" AUTO)
+adios_option(HDF5_VOL   "Enable support for HDF5 ADIOS2 VOL" AUTO)
 adios_option(IME        "Enable support for DDN IME transport" AUTO)
 adios_option(Python     "Enable support for Python bindings" AUTO)
 adios_option(Fortran    "Enable support for Fortran bindings" AUTO)

cmake/DetectOptions.cmake

@@ -318,6 +318,18 @@ elseif(ADIOS2_USE_HDF5)
     message(FATAL_ERROR "MPI is disabled but parallel HDF5 is detected.")
   endif()
   set(ADIOS2_HAVE_HDF5 TRUE)
+
+  # HDF5 VOL requires 1.13+
+  if(ADIOS2_USE_HDF5_VOL AND ADIOS2_HAVE_HDF5)
+    if(HDF5_VERSION GREATER_EQUAL 1.14)
+      set(ADIOS2_HAVE_HDF5_VOL TRUE)
+    else()
+      set(ADIOS2_HAVE_HDF5_VOL FALSE)
+      if(ADIOS2_USE_HDF5_VOL STREQUAL ON)
+        message(FATAL_ERROR "ADIOS HDF5_VOL requires HDF5>=1.14+")
+      endif()
+    endif()
+  endif()
 endif()
 
 # IME

source/CMakeLists.txt

@@ -6,18 +6,6 @@
 add_subdirectory(adios2)
 add_subdirectory(utils)
 
-# HDF5 VOL requires 1.13+
-if(ADIOS2_HAVE_HDF5)
-  if(HDF5_VERSION VERSION_LESS 1.14)
-    set(ADIOS2_HAVE_HDF5_VOL OFF CACHE INTERNAL "")
-    message(STATUS "[ADIOS2 WARNING] To enable ADIOS VOL for HDF5, please use the version 1.14+ ")
-  else()
-    set(ADIOS2_HAVE_HDF5_VOL ON CACHE INTERNAL "")
-  endif()
-else()
-  set(ADIOS2_HAVE_HDF5_VOL OFF CACHE INTERNAL "")
-endif()
-
 if(ADIOS2_HAVE_HDF5_VOL)
   add_subdirectory(h5vol)
 endif()