mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
Fix merge conflicts
This commit is contained in:
parent
685c4e08ae
commit
901c65eb2b
@ -652,7 +652,6 @@ HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks"
|
||||
HDF_TEST_EXPRESS "Control testing framework (0-3)" "0"
|
||||
HDF5_TEST_VFD "Execute tests with different VFDs" OFF
|
||||
HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF
|
||||
SKIP_ERROR_STACK_TESTS "Skip tests that check the error stack" OFF
|
||||
HDF5_USE_16_API_DEFAULT "Use the HDF5 1.6.x API by default" OFF
|
||||
HDF5_USE_18_API_DEFAULT "Use the HDF5 1.8.x API by default" OFF
|
||||
HDF5_USE_110_API_DEFAULT "Use the HDF5 1.10.x API by default" OFF
|
||||
|
Loading…
Reference in New Issue
Block a user