summaryrefslogtreecommitdiffstats
path: root/release_docs/INSTALL_CMake.txt
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-04-15 14:46:29 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-04-15 19:46:23 (GMT)
commit68bddef35d2c84838fd9e769720bfb04875a629f (patch)
tree05187d18c4203e8aa153e3e0a5d8d84564cf2044 /release_docs/INSTALL_CMake.txt
parent4d224f4f19ec8bfe2ac17600e6ea7ca010807efb (diff)
downloadhdf5-68bddef35d2c84838fd9e769720bfb04875a629f.zip
hdf5-68bddef35d2c84838fd9e769720bfb04875a629f.tar.gz
hdf5-68bddef35d2c84838fd9e769720bfb04875a629f.tar.bz2
HDFFV-10741 - remove SKIP_ERRSTK_TESTS option
Diffstat (limited to 'release_docs/INSTALL_CMake.txt')
-rw-r--r--release_docs/INSTALL_CMake.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index 4bba5e8..51816c6 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -651,7 +651,11 @@ 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