summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2019-04-15 19:36:51 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2019-04-15 19:36:51 (GMT)
commit4d224f4f19ec8bfe2ac17600e6ea7ca010807efb (patch)
treeb415655d1783ad1c793a711ab9ca4dbeaa102f0d
parent685c4e08ae74bdf8bc8fec898b600e6e9e11c24b (diff)
parent901c65eb2b102cbe431b82a6f72510b2f417ae6a (diff)
downloadhdf5-4d224f4f19ec8bfe2ac17600e6ea7ca010807efb.zip
hdf5-4d224f4f19ec8bfe2ac17600e6ea7ca010807efb.tar.gz
hdf5-4d224f4f19ec8bfe2ac17600e6ea7ca010807efb.tar.bz2
Merge pull request #1657 in HDFFV/hdf5 from ~BYRN/hdf5_merge_adb:develop to develop
* commit '901c65eb2b102cbe431b82a6f72510b2f417ae6a': Fix merge conflicts
-rw-r--r--release_docs/INSTALL_CMake.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/release_docs/INSTALL_CMake.txt b/release_docs/INSTALL_CMake.txt
index f61f016..4bba5e8 100644
--- a/release_docs/INSTALL_CMake.txt
+++ b/release_docs/INSTALL_CMake.txt
@@ -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