mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-31 17:10:47 +08:00
Remove conflict symbols
This commit is contained in:
parent
68bddef35d
commit
2420ea11ad
@ -651,11 +651,7 @@ HDF5_PACKAGE_EXTLIBS "CPACK - include external libraries"
|
||||
HDF5_STRICT_FORMAT_CHECKS "Whether to perform strict file format checks" OFF
|
||||
HDF_TEST_EXPRESS "Control testing framework (0-3)" "0"
|
||||
HDF5_TEST_VFD "Execute tests with different VFDs" OFF
|
||||
<<<<<<< Upstream, based on branch 'develop' of https://byrn@bitbucket.hdfgroup.org/scm/~byrn/hdf5_adb.git
|
||||
HDF5_TEST_PASSTHROUGH_VOL "Execute tests with different passthrough VOL connectors" OFF
|
||||
=======
|
||||
HDF5_TEST_VOL "Execute tests with different VOL connectors" OFF
|
||||
>>>>>>> e60534e HDFFV-10741 - remove SKIP_ERRSTK_TESTS option
|
||||
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…
x
Reference in New Issue
Block a user