diff options
author | Richard Warren <Richard.Warren@hdfgroup.org> | 2019-12-06 21:42:36 (GMT) |
---|---|---|
committer | Richard Warren <Richard.Warren@hdfgroup.org> | 2019-12-06 21:42:36 (GMT) |
commit | 0c06cfc6ef9d851908f1017881598628ddf70b2a (patch) | |
tree | 0046503ba9371adcf6ad33a307d6e6827e52d88a /CMakeLists.txt | |
parent | 9d24eefaf71bae79ab3e483a608ddb8deff17b39 (diff) | |
download | hdf5-0c06cfc6ef9d851908f1017881598628ddf70b2a.zip hdf5-0c06cfc6ef9d851908f1017881598628ddf70b2a.tar.gz hdf5-0c06cfc6ef9d851908f1017881598628ddf70b2a.tar.bz2 |
Merged HDFFV-10929_2GB_testing to hdf5_1_12
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 38ec775..7ae0833 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -646,9 +646,9 @@ if (H5_HAVE_PARALLEL) endif () endif () -#option (DEFAULT_API_VERSION "Enable v1.12 API (v16, v18, v110, v112)" "v112") -set (DEFAULT_API_VERSION "v112" CACHE STRING "Enable v1.12 API (v16, v18, v110, v112)") -set_property (CACHE DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110 v112) +#option (DEFAULT_API_VERSION "Enable v1.14 API (v16, v18, v110, v112, v114)" "v114") +set (DEFAULT_API_VERSION "v114" CACHE STRING "Enable v1.14 API (v16, v18, v110, v112, v114)") +set_property (CACHE DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110 v112 v114) #----------------------------------------------------------------------------- # Option to use 1.6.x API #----------------------------------------------------------------------------- @@ -685,6 +685,17 @@ if (DEFAULT_API_VERSION MATCHES "v112") endif () #----------------------------------------------------------------------------- +# Option to use 1.14.x API +#----------------------------------------------------------------------------- +if (NOT DEFAULT_API_VERSION) + set (DEFAULT_API_VERSION "v114") +endif () +set (H5_USE_114_API_DEFAULT 0) +if (DEFAULT_API_VERSION MATCHES "v114") + set (H5_USE_114_API_DEFAULT 1) +endif () + +#----------------------------------------------------------------------------- # Include user macros #----------------------------------------------------------------------------- include (UserMacros.cmake) |