diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-08-12 20:58:48 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-08-12 20:58:48 (GMT) |
| commit | e874070dbb27994b24860f94ffc53ca1b12211fa (patch) | |
| tree | 1f05aec4f477d804783c98539d8948cf90b6bb5e | |
| parent | 3af5cce895e01c25d94fb6e81d5de780c8936690 (diff) | |
| parent | c476f020769d8f78581ef399c59e3d4e6e202b2f (diff) | |
| download | hdf5-e874070dbb27994b24860f94ffc53ca1b12211fa.zip hdf5-e874070dbb27994b24860f94ffc53ca1b12211fa.tar.gz hdf5-e874070dbb27994b24860f94ffc53ca1b12211fa.tar.bz2 | |
Merge pull request #1856 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c476f020769d8f78581ef399c59e3d4e6e202b2f':
HDFFV-10879 fix reference file
HDFFV-10879 correct API version set command
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | test/testfiles/error_test_2 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7115ecb..374e15e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -642,7 +642,7 @@ if (H5_HAVE_PARALLEL) endif () endif () -set (DEFAULT_API_VERSION "v112" CACHE STRING "Enable v1.12 API (v16, v18, v110, v112)" FORCE) +#set (DEFAULT_API_VERSION "v112" CACHE STRING "Enable v1.12 API (v16, v18, v110, v112)" FORCE) set_property (CACHE DEFAULT_API_VERSION PROPERTY STRINGS v16 v18 v110 v112) #----------------------------------------------------------------------------- # Option to use 1.6.x API diff --git a/test/testfiles/error_test_2 b/test/testfiles/error_test_2 index 6852f6f..85bc2e7 100644 --- a/test/testfiles/error_test_2 +++ b/test/testfiles/error_test_2 @@ -1 +1 @@ -Test skipped because backward compatbility with v1.6 is configured in +Test skipped because backward compatibility with v1.6 is configured in |