Use a STRING option for API version

4 files changed, 29 insertions, 26 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae67120..05f96e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -621,38 +621,33 @@ if (H5_HAVE_PARALLEL)
   endif ()
 endif ()
 
-set (DEFAULT_API_VERSION "v110")
+set (DEFAULT_API_VERSION "v110" CACHE STRING "Enable v1.10 API (v16, v18, v110)" FORCE)
+set_property (CACHE DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110 v112)
 #-----------------------------------------------------------------------------
 # Option to use 1.6.x API
 #-----------------------------------------------------------------------------
-option (HDF5_USE_16_API_DEFAULT "Use the HDF5 1.6.x API by default" OFF)
 set (H5_USE_16_API_DEFAULT 0)
-if (HDF5_USE_16_API_DEFAULT)
+if (DEFAULT_API_VERSION MATCHES "v16")
   set (H5_USE_16_API_DEFAULT 1)
-  set (DEFAULT_API_VERSION "v16")
 endif ()
 
 #-----------------------------------------------------------------------------
 # Option to use 1.8.x API
 #-----------------------------------------------------------------------------
-option (HDF5_USE_18_API_DEFAULT "Use the HDF5 1.8.x API by default" OFF)
 set (H5_USE_18_API_DEFAULT 0)
-if (HDF5_USE_18_API_DEFAULT)
+if (DEFAULT_API_VERSION MATCHES "v18")
   set (H5_USE_18_API_DEFAULT 1)
-  set (DEFAULT_API_VERSION "v18")
 endif ()
 
 #-----------------------------------------------------------------------------
 # Option to use 1.10.x API
 #-----------------------------------------------------------------------------
-option (HDF5_USE_110_API_DEFAULT "Use the HDF5 1.10.x API by default" OFF)
-if (NOT HDF5_USE_16_API_DEFAULT AND NOT HDF5_USE_18_API_DEFAULT AND NOT HDF5_USE_110_API_DEFAULT)
-  set (HDF5_USE_110_API_DEFAULT ON)
+if (NOT DEFAULT_API_VERSION)
+  set (DEFAULT_API_VERSION "v110")
 endif ()
 set (H5_USE_110_API_DEFAULT 0)
-if (HDF5_USE_110_API_DEFAULT)
+if (DEFAULT_API_VERSION MATCHES "v110")
   set (H5_USE_110_API_DEFAULT 1)
-  set (DEFAULT_API_VERSION "v110")
 endif ()
 
 #-----------------------------------------------------------------------------
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index d399efa..0895268 100644
--- a/config/cmake/cacheinit.cmake
+++ b/config/cmake/cacheinit.cmake
@@ -35,7 +35,7 @@ set (MPIEXEC_MAX_NUMPROCS "4" CACHE STRING "Minimum number of processes for HDF
 
 set (HDF5_ENABLE_ALL_WARNINGS ON CACHE BOOL "Enable all warnings" FORCE)
 
-set (HDF5_USE_110_API_DEFAULT ON CACHE BOOL "Enable v1.10 API" FORCE)
+set (DEFAULT_API_VERSION "v110" CACHE STRING "Enable v1.10 API (v16, v18, v110)" FORCE)
 
 set (HDF_TEST_EXPRESS "2" CACHE STRING "Control testing framework (0-3)" FORCE)
 
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 5d76b58..76a3fe4 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -651,10 +651,8 @@ HDF5_PACKAGE_EXTLIBS           "CPACK - include external libraries"
 HDF5_STRICT_FORMAT_CHECKS      "Whether to perform strict file format checks"                 OFF
 HDF_TEST_EXPRESS               "Control testing framework (0-3)"                              "0"
 HDF5_TEST_VFD                  "Execute tests with different VFDs"                            OFF
-HDF5_USE_16_API_DEFAULT        "Use the HDF5 1.6.x API by default"                            OFF
-HDF5_USE_18_API_DEFAULT        "Use the HDF5 1.8.x API by default"                            OFF
-HDF5_USE_110_API_DEFAULT       "Use the HDF5 1.10.x API by default"                           OFF
-HDF5_USE_112_API_DEFAULT       "Use the HDF5 1.12.x API by default"                           ON
+HDF5_TEST_PASSTHROUGH_VOL      "Execute tests with different passthrough VOL connectors"      OFF
+DEFAULT_API_VERSION            "Enable default API (v16, v18, v110)"                          "v110"
 HDF5_USE_FOLDERS               "Enable folder grouping of projects in IDEs."                  ON
 HDF5_WANT_DATA_ACCURACY        "IF data accuracy is guaranteed during data conversions"       ON
 HDF5_WANT_DCONV_EXCEPTION      "exception handling functions is checked during data conversions" ON
@@ -667,13 +665,13 @@ if (HDF5_TEST_VFD)
     HDF5_TEST_FHEAP_VFD        "Execute fheap test with different VFDs"      ON
 
 ---------------- External Library Options ---------------------
-HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building"        "NO"
-HDF5_ENABLE_SZIP_SUPPORT    "Use SZip Filter"                        OFF
-HDF5_ENABLE_Z_LIB_SUPPORT   "Enable Zlib Filters"                    OFF
-ZLIB_USE_EXTERNAL           "Use External Library Building for ZLIB" 0
-SZIP_USE_EXTERNAL           "Use External Library Building for SZIP" 0
+HDF5_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)"        "NO"
+HDF5_ENABLE_SZIP_SUPPORT    "Use SZip Filter"                                     OFF
+HDF5_ENABLE_Z_LIB_SUPPORT   "Enable Zlib Filters"                                 OFF
+ZLIB_USE_EXTERNAL           "Use External Library Building for ZLIB"              0
+SZIP_USE_EXTERNAL           "Use External Library Building for SZIP"              0
 if (HDF5_ENABLE_SZIP_SUPPORT)
-    HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding"      OFF
+    HDF5_ENABLE_SZIP_ENCODING "Use SZip Encoding"                                 OFF
 if (WINDOWS)
     H5_DEFAULT_PLUGINDIR    "%ALLUSERSPROFILE%/hdf5/lib/plugin"
 else ()
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index a40f092..2a34397 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -174,13 +174,13 @@ Bug Fixes since HDF5-1.10.5 release
       together with library high bound setting to H5F_LIBVER_V18.
 
       When setting non-default file space info in fcpl via
-      H5Pset_file_space_strategy() and then creating a file with 
+      H5Pset_file_space_strategy() and then creating a file with
       both high and low library bounds set to
       H5F_LIBVER_V18 in fapl, the library succeeds in creating the file.
       File creation should fail because the feature of setting non-default
       file space info does not exist in library release 1.8 or earlier.
 
-      This was fixed by setting and checking the proper version in the 
+      This was fixed by setting and checking the proper version in the
       file space info message based on the library low and high bounds
       when creating and opening the HDF5 file.
 
@@ -194,7 +194,7 @@ Bug Fixes since HDF5-1.10.5 release
       H5F_LIBVER_V18, the H5Ocopy() call will fail with the error stack indicating
       that the fill value version is out of bounds.
 
-      This was fixed by changing the fill value message version to H5O_FILL_VERSION_3 
+      This was fixed by changing the fill value message version to H5O_FILL_VERSION_3
       (from H5O_FILL_VERSION_2) for H5F_LIBVER_V18.
 
       (VC - 2019/6/14, HDFFV-10800)
@@ -226,6 +226,16 @@ Bug Fixes since HDF5-1.10.5 release
     ----------------
     -
 
+    Configuration
+    -------------
+    - Correct option for default API version
+
+      CMake options for default API version are not mutually exclusive.
+      Change the multiple BOOL options to a single STRING option with the
+      strings; v16, v18, v110.
+
+      (ADB - 2019/08/12, HDFFV-10879)
+
     Fortran
     --------
     -