Use a STRING option for API version

4 files changed, 26 insertions, 24 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c46d95..02bd784 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -496,28 +496,25 @@ if (H5_HAVE_PARALLEL)
   endif ()
 endif ()
 
-set (DEFAULT_API_VERSION "v18")
+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)
-if (NOT HDF5_USE_16_API_DEFAULT AND NOT HDF5_USE_18_API_DEFAULT)
-  set (HDF5_USE_18_API_DEFAULT ON)
+if (NOT DEFAULT_API_VERSION)
+  set (DEFAULT_API_VERSION "v18")
 endif ()
 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 ()
 
 #-----------------------------------------------------------------------------
diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake
index 8913bbc..b545555 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_18_API_DEFAULT ON CACHE BOOL "Enable v1.8 API" FORCE)
+set (DEFAULT_API_VERSION "v18" CACHE STRING "Enable v1.8 API (v16, v18)" 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 9b398cb..0f6edd9 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -650,8 +650,7 @@ 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"                            ON
+DEFAULT_API_VERSION            "Enable default API (v16, v18)"                                "v18"
 HDF5_USE_FOLDERS               "Enable folder grouping of projects in IDEs."                  OFF
 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
@@ -665,13 +664,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 c675d34..487631f 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -57,17 +57,17 @@ New Features
     Configuration
     -------------
     - Add options to enable or disable building tools and tests
-    
-      Configure options --enable-tests and --enable-tools were added for 
+
+      Configure options --enable-tests and --enable-tools were added for
       autotools configure.  These options are enabled by default, and can be
-      disabled with either --disable-tests (or tools) or --enable-tests=no 
-      (or --enable-tools=no).  Build time is reduced ~20% when tools are 
+      disabled with either --disable-tests (or tools) or --enable-tests=no
+      (or --enable-tools=no).  Build time is reduced ~20% when tools are
       disabled, 35% when tests are disabled, 45% when both are disabled.
       Reenabling them after the initial build requires running configure
       again with the option(s) enabled.
 
       (DAP - 2019/07/24, HDFFV-9976)
-      
+
     - Update CMake tests to use FIXTURES
 
       CMake test fixtures allow setup/cleanup tests and other dependency
@@ -195,7 +195,13 @@ Bug Fixes since HDF5-1.8.21
 
     Configuration
     -------------
-    - None
+    - 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.
+
+      (ADB - 2019/08/12, HDFFV-10879)
 
 
     Library