use *_ENABLE_* settings instead to report the state

brtnfld · Apr 2, 2024 · 53880db · 53880db
1 parent c3b0823
commit 53880db
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -666,7 +666,6 @@ set (CMAKE_MODULE_PATH ${HDF_RESOURCES_DIR} ${CMAKE_MODULE_PATH})
 # Option to Enable HDFS
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_HDFS "Enable HDFS" OFF)
-set(H5_HAVE_LIBHDFS_SETTING OFF)
 if (HDF5_ENABLE_HDFS)
   find_package(JNI REQUIRED)
   if (JNI_FOUND)
@@ -675,7 +674,6 @@ if (HDF5_ENABLE_HDFS)
   find_package(HDFS REQUIRED)
   if (HDFS_FOUND)
     set (H5_HAVE_LIBHDFS 1)
-    set (H5_HAVE_LIBHDFS_SETTING ON)
     set (H5_HAVE_HDFS_H 1)
     if (NOT MSVC)
       list (APPEND LINK_LIBS -pthread)
@@ -750,7 +748,6 @@ set (HDF5_SRC_INCLUDE_DIRS
     ${H5FD_SUBFILING_DIR}
 )
 option (HDF5_ENABLE_SUBFILING_VFD "Build Parallel HDF5 Subfiling VFD" OFF)
-set (H5_HAVE_SUBFILING_VFD_SETTING OFF)
 if (HDF5_ENABLE_SUBFILING_VFD)
   if (WIN32)
     message (FATAL_ERROR " **** Subfiling is not supported on Windows **** ")
@@ -784,7 +781,6 @@ if (HDF5_ENABLE_SUBFILING_VFD)
   endif()
 
   set (H5_HAVE_SUBFILING_VFD 1)
-  set (H5_HAVE_SUBFILING_VFD_SETTING ON)
   # IOC VFD is currently only built when subfiling is enabled
   set (H5_HAVE_IOC_VFD 1)
 

diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
@@ -603,7 +603,6 @@ unset (CMAKE_EXTRA_INCLUDE_FILES)
 # Check whether we can build the direct VFD
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_DIRECT_VFD "Build the Direct I/O Virtual File Driver" OFF)
-set (HDF5_ENABLE_DIRECT_VFD_SETTING OFF)
 if (HDF5_ENABLE_DIRECT_VFD)
   # The direct VFD is tied to POSIX direct I/O as enabled by the O_DIRECT
   # flag. No other form of direct I/O is supported. This feature also
@@ -613,7 +612,6 @@ if (HDF5_ENABLE_DIRECT_VFD)
 
   if (HAVE_O_DIRECT AND HAVE_POSIX_MEMALIGN)
     set (${HDF_PREFIX}_HAVE_DIRECT 1)
-    set (HDF5_ENABLE_DIRECT_VFD_SETTING ON)
   else ()
     message (FATAL_ERROR "The direct VFD was requested but cannot be built.\nIt requires O_DIRECT flag support and posix_memalign()")
   endif ()
@@ -623,13 +621,11 @@ endif ()
 #  Check if ROS3 driver can be built
 #-----------------------------------------------------------------------------
 option (HDF5_ENABLE_ROS3_VFD "Build the ROS3 Virtual File Driver" OFF)
-set (H5_ENABLE_ROS3_VFD_SETTING OFF)
   if (HDF5_ENABLE_ROS3_VFD)
     find_package(CURL REQUIRED)
     find_package(OpenSSL REQUIRED)
     if (${CURL_FOUND} AND ${OPENSSL_FOUND})
       set (${HDF_PREFIX}_HAVE_ROS3_VFD 1)
-      set (H5_ENABLE_ROS3_VFD_SETTING ON)
       list (APPEND LINK_LIBS ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
       INCLUDE_DIRECTORIES (${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
     else ()
@@ -641,15 +637,13 @@ endif ()
 # Check whether we can build the mirror VFD
 # ----------------------------------------------------------------------
 option (HDF5_ENABLE_MIRROR_VFD "Build the Mirror Virtual File Driver" OFF)
-set (${HDF_PREFIX}_HAVE_MIRROR_VFD_SETTING OFF)
 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
        ${HDF_PREFIX}_HAVE_SYS_SOCKET_H AND
        ${HDF_PREFIX}_HAVE_FORK)
       set (${HDF_PREFIX}_HAVE_MIRROR_VFD 1)
-      set (${HDF_PREFIX}_HAVE_MIRROR_VFD_SETTING ON)
   else()
       message(WARNING "The socket-based Mirror VFD was requested but cannot be built. System prerequisites are not met.")
   endif()
@@ -805,7 +799,7 @@ macro (H5ConversionTests TEST def msg)
           message (VERBOSE "${msg}... no")
           file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
             "Test ${TEST} Compile succeeded with the following output:\n ${${TEST}_COMPILE_OUTPUT}\n"
-          )         
+          )
           file (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log
             "Test ${TEST} Run failed with exit code ${${TEST}_RUN} and with the following output:\n ${${TEST}_RUN_OUTPUT}\n"
           )

diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
@@ -28,7 +28,7 @@ Linking Options:
                      AM_LDFLAGS: @AM_LDFLAGS@
                 Extra libraries: @LINK_LIBS@
                        Archiver: @CMAKE_AR@
-                       AR_FLAGS: 
+                       AR_FLAGS:
                          Ranlib: @CMAKE_RANLIB@
 
 Languages:
@@ -80,11 +80,11 @@ Dimension scales w/ new references: @DIMENSION_SCALES_WITH_NEW_REF@
             I/O filters (external): @EXTERNAL_FILTERS@
                   _Float16 support: @HDF5_ENABLE_NONSTANDARD_FEATURE_FLOAT16@
                      Map (H5M) API: @H5_HAVE_MAP_API@
-                        Direct VFD: @HDF5_ENABLE_DIRECT_VFD_SETTING@
-                        Mirror VFD: @H5_HAVE_MIRROR_VFD_SETTING@
-                     Subfiling VFD: @H5_HAVE_SUBFILING_VFD_SETTING@
-                (Read-Only) S3 VFD: @H5_ENABLE_ROS3_VFD_SETTING@
-              (Read-Only) HDFS VFD: @H5_HAVE_LIBHDFS_SETTING@
+                        Direct VFD: @HDF5_ENABLE_DIRECT_VFD@
+                        Mirror VFD: @HDF5_ENABLE_MIRROR_VFD@
+                     Subfiling VFD: @HDF5_ENABLE_SUBFILING_VFD@
+                (Read-Only) S3 VFD: @HDF5_ENABLE_ROS3_VFD@
+              (Read-Only) HDFS VFD: @HDF5_ENABLE_HDFS@
     Packages w/ extra debug output: @INTERNAL_DEBUG_OUTPUT@
                        API Tracing: @HDF5_ENABLE_TRACE@
               Using memory checker: @HDF5_ENABLE_USING_MEMCHECKER@