Merge pull request #1531 from NetCDF-World-Domination-Council/ejh_upd…

…ate_netcdf_meta Add a dispatch version number to netcdf_meta.h and libnetcdf.settings, in case we decide to change dispatch table in future
Unidata · Nov 15, 2019 · 788d20d · 788d20d
2 parents 5818fac + c1989b7
commit 788d20d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,6 +35,9 @@ SET(netCDF_LIB_VERSION 15)
 SET(netCDF_SO_VERSION 15)
 SET(PACKAGE_VERSION ${VERSION})
 
+# Version of the dispatch table, in case we change it.
+SET(NC_DISPATCH_VERSION 1)
+
 # Get system configuration, Use it to determine osname, os release, cpu. These
 # will be used when committing to CDash.
 find_program(UNAME NAMES uname)

diff --git a/configure.ac b/configure.ac
@@ -1496,6 +1496,7 @@ AX_SET_META([NC_HAS_CDF5],[$enable_cdf5],[yes])
 AX_SET_META([NC_HAS_ERANGE_FILL], [$enable_erange_fill],[yes])
 AX_SET_META([NC_RELAX_COORD_BOUND], [$enable_zero_length_coord_bound],[yes])
 AX_SET_META([NC_HAS_BYTERANGE],[$enable_byterange],[yes])
+AC_SUBST([NC_DISPATCH_VERSION], [1])
 #####
 # End netcdf_meta.h definitions.
 #####

diff --git a/include/netcdf_meta.h.in b/include/netcdf_meta.h.in
@@ -57,5 +57,6 @@
 #define NC_HAS_CDF5      @NC_HAS_CDF5@  /*!< CDF5 support. */
 #define NC_HAS_ERANGE_FILL @NC_HAS_ERANGE_FILL@ /*!< ERANGE_FILL Support */
 #define NC_RELAX_COORD_BOUND @NC_RELAX_COORD_BOUND@ /*!< RELAX_COORD_BOUND */
+#define NC_DISPATCH_VERSION @NC_DISPATCH_VERSION@ /*!< Dispatch table version */
 
 #endif
diff --git a/libnetcdf.settings.in b/libnetcdf.settings.in
@@ -39,3 +39,4 @@ JNA Support:		@HAS_JNA@
 CDF5 Support:		@HAS_CDF5@
 ERANGE Fill Support:	@HAS_ERANGE_FILL@
 Relaxed Boundary Check:	@RELAX_COORD_BOUND@
+Dispatch Version:       @NC_DISPATCH_VERSION@