From d2244b0b0665a5d0a4d95f28a3e0bd1f3aa66aed Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Tue, 13 Aug 2019 11:04:23 -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 ca16c55..58e1c85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -621,7 +621,8 @@ if (H5_HAVE_PARALLEL) endif () endif () -#set (DEFAULT_API_VERSION "v110" CACHE STRING "Enable v1.10 API (v16, v18, v110)" FORCE) +#option (DEFAULT_API_VERSION "Enable v1.10 API (v16, v18, v110)" "v110") +set (DEFAULT_API_VERSION "v110" CACHE STRING "Enable v1.10 API (v16, v18, v110)") set_property (CACHE DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110) #----------------------------------------------------------------------------- # Option to use 1.6.x API diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 0895268..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 "v110" CACHE STRING "Enable v1.10 API (v16, v18, v110)" 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