From 7322752ab1084fad116052d38de633afb8a55f00 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 12 Aug 2019 11:26:41 -0500 Subject: Fix API version option --- CMakeLists.txt | 5 ++++- config/cmake/cacheinit.cmake | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d8a629e..ae67120 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -645,7 +645,10 @@ endif () #----------------------------------------------------------------------------- # Option to use 1.10.x API #----------------------------------------------------------------------------- -option (HDF5_USE_110_API_DEFAULT "Use the HDF5 1.10.x API by default" ON) +option (HDF5_USE_110_API_DEFAULT "Use the HDF5 1.10.x API by default" OFF) +if (NOT HDF5_USE_16_API_DEFAULT AND NOT HDF5_USE_18_API_DEFAULT AND NOT HDF5_USE_110_API_DEFAULT) + set (HDF5_USE_110_API_DEFAULT ON) +endif () set (H5_USE_110_API_DEFAULT 0) if (HDF5_USE_110_API_DEFAULT) set (H5_USE_110_API_DEFAULT 1) diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 5254115..d399efa 100644 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -35,6 +35,8 @@ 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 (HDF5_USE_110_API_DEFAULT ON CACHE BOOL "Enable v1.10 API" 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