summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-08-17 19:56:45 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-08-17 19:56:45 (GMT)
commit965f673cea5da570b05753d9e78057d287af0bc7 (patch)
tree90a56d75e0a3477b059ee12545ba9702977e837e
parent105a05cb9072d21b4158eb9743990b07623097a7 (diff)
parentae7da889ece8ea6cfe3207f146ee991951b5ce66 (diff)
downloadhdf5-965f673cea5da570b05753d9e78057d287af0bc7.zip
hdf5-965f673cea5da570b05753d9e78057d287af0bc7.tar.gz
hdf5-965f673cea5da570b05753d9e78057d287af0bc7.tar.bz2
Merge pull request #1206 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit 'ae7da889ece8ea6cfe3207f146ee991951b5ce66': HDFFV-10552 Add missing HDF5_USE_110[2]_API_DEFAULT option
-rw-r--r--CMakeLists.txt20
-rw-r--r--config/cmake/H5pubconf.h.in3
-rw-r--r--configure.ac13
-rw-r--r--release_docs/INSTALL_CMake.txt2
-rw-r--r--release_docs/RELEASE.txt10
5 files changed, 45 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cdb31c..b76f332 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -620,6 +620,26 @@ if (HDF5_USE_18_API_DEFAULT)
endif ()
#-----------------------------------------------------------------------------
+# Option to use 1.10.x API
+#-----------------------------------------------------------------------------
+option (HDF5_USE_110_API_DEFAULT "Use the HDF5 1.10.x API by default" OFF)
+set (H5_USE_110_API_DEFAULT 0)
+if (HDF5_USE_110_API_DEFAULT)
+ set (H5_USE_110_API_DEFAULT 1)
+ set (DEFAULT_API_VERSION "v110")
+endif ()
+
+#-----------------------------------------------------------------------------
+# Option to use 1.12.x API
+#-----------------------------------------------------------------------------
+option (HDF5_USE_112_API_DEFAULT "Use the HDF5 1.12.x API by default" ON)
+set (H5_USE_112_API_DEFAULT 0)
+if (HDF5_USE_112_API_DEFAULT)
+ set (H5_USE_112_API_DEFAULT 1)
+ set (DEFAULT_API_VERSION "v112")
+endif ()
+
+#-----------------------------------------------------------------------------
# Include user macros
#-----------------------------------------------------------------------------
include (UserMacros.cmake)
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in
index ccfe581..1d73bba 100644
--- a/config/cmake/H5pubconf.h.in
+++ b/config/cmake/H5pubconf.h.in
@@ -669,6 +669,9 @@
/* Define using v1.8 public API symbols by default */
#cmakedefine H5_USE_18_API_DEFAULT @H5_USE_18_API_DEFAULT@
+/* Define using v1.10 public API symbols by default */
+#cmakedefine H5_USE_110_API_DEFAULT @H5_USE_110_API_DEFAULT@
+
/* Define if a memory checking tool will be used on the library, to cause
library to be very picky about memory operations and also disable the
internal free list manager code. */
diff --git a/configure.ac b/configure.ac
index ff0f284..fc82636 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3191,10 +3191,10 @@ esac
AC_SUBST([DEFAULT_API_VERSION])
AC_MSG_CHECKING([which version of public symbols to use by default])
AC_ARG_WITH([default-api-version],
- [AS_HELP_STRING([--with-default-api-version=(v16|v18|v110)],
+ [AS_HELP_STRING([--with-default-api-version=(v16|v18|v110|v112)],
[Specify default release version of public symbols
- [default=v110]])],,
- [withval=v110])
+ [default=v112]])],,
+ [withval=v112])
if test "X$withval" = "Xv16"; then
AC_MSG_RESULT([v16])
@@ -3209,6 +3209,13 @@ elif test "X$withval" = "Xv18"; then
elif test "X$withval" = "Xv110"; then
AC_MSG_RESULT([v110])
DEFAULT_API_VERSION=v110
+ AC_DEFINE([USE_110_API_DEFAULT], [1],
+ [Define using v1.10 public API symbols by default])
+elif test "X$withval" = "Xv112"; then
+ AC_MSG_RESULT([v112])
+ DEFAULT_API_VERSION=v112
+ AC_DEFINE([USE_112_API_DEFAULT], [1],
+ [Define using v1.12 public API symbols by default])
else
AC_MSG_ERROR([invalid version of public symbols given])
fi
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 728fd05..ba77ac4 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -619,6 +619,8 @@ HDF_TEST_EXPRESS "Control testing framework (0-3)"
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_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
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 3d42284..49ad436 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -47,6 +47,16 @@ New Features
Configuration:
-------------
+ - Add missing USE_110_API_DEFAULT option.
+
+ Option USE_110_API_DEFAULT sets the default version of
+ versioned APIs. The bin/makevers perl script did not set
+ the maxidx variable correctly when the 1.10 branch was
+ created. This caused the versioning process to always use
+ the latest version of any API.
+
+ (ADB - 2018/08/17, HDFFV-10552)
+
- Added configuration checks for the following MPI functions:
MPI_Mprobe - Used for the Parallel Compression feature