From 7b8ffecc20ad383627ea2dbfa86aaebdf5f5b76b Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 13 Aug 2019 11:04:13 -0500 Subject: HDFFV-10879 set default API version --- CMakeLists.txt | 3 ++- config/cmake/cacheinit.cmake | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 374e15e..f5921f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -642,7 +642,8 @@ if (H5_HAVE_PARALLEL) endif () endif () -#set (DEFAULT_API_VERSION "v112" CACHE STRING "Enable v1.12 API (v16, v18, v110, v112)" FORCE) +#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 to use 1.6.x API diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 01c2221..5254115 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -35,8 +35,6 @@ 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 (DEFAULT_API_VERSION "v112" CACHE STRING "Enable v1.12 API (v16, v18, v110, v112)" FORCE) - set (HDF_TEST_EXPRESS "2" CACHE STRING "Control testing framework (0-3)" FORCE) set (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE) -- cgit v0.12