diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-04-15 20:03:01 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-04-15 20:03:01 (GMT) |
| commit | 2420ea11ad510121cc7553378a6bfa6fd8fdcd05 (patch) | |
| tree | 5a28b2360d7411890d51fea231cfc93a6d2a1693 /release_docs | |
| parent | 68bddef35d2c84838fd9e769720bfb04875a629f (diff) | |
| download | hdf5-2420ea11ad510121cc7553378a6bfa6fd8fdcd05.zip hdf5-2420ea11ad510121cc7553378a6bfa6fd8fdcd05.tar.gz hdf5-2420ea11ad510121cc7553378a6bfa6fd8fdcd05.tar.bz2 | |
Remove conflict symbols
Diffstat (limited to 'release_docs')
| -rw-r--r-- | release_docs/INSTALL_CMake.txt | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt index 51816c6..4bba5e8 100644 --- a/release_docs/INSTALL_CMake.txt +++ b/release_docs/INSTALL_CMake.txt @@ -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 |