summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2016-04-15 14:22:22 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2016-04-15 14:22:22 (GMT)
commit3bbe21ce7bbd8246600c0099e64e644501f5a806 (patch)
treef586aab78571b9f05e2c6057a14292b84910f4af
parent47f62f1e61b71469bdd6ce142f0c9282697ff10f (diff)
downloadhdf5-3bbe21ce7bbd8246600c0099e64e644501f5a806.zip
hdf5-3bbe21ce7bbd8246600c0099e64e644501f5a806.tar.gz
hdf5-3bbe21ce7bbd8246600c0099e64e644501f5a806.tar.bz2
[svn-r29706] Add new skip test for VDS and remove duplicate include
-rw-r--r--config/cmake/CTestCustom.cmake1
-rw-r--r--config/cmake/ConfigureChecks.cmake5
2 files changed, 5 insertions, 1 deletions
diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake
index 41cb488..85f7d27 100644
--- a/config/cmake/CTestCustom.cmake
+++ b/config/cmake/CTestCustom.cmake
@@ -46,6 +46,7 @@ set (CTEST_CUSTOM_MEMCHECK_IGNORE
H5DUMP-clearall-objects
H5DUMP_PACKED_BITS-clearall-objects
H5DUMP-XML-clearall-objects
+ H5DUMP_VDS-clearall-objects
######### tools/h5import #########
H5IMPORT-clear-objects
######### tools/h5jam #########
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake
index 49e9a05..ec0aecf 100644
--- a/config/cmake/ConfigureChecks.cmake
+++ b/config/cmake/ConfigureChecks.cmake
@@ -3,7 +3,10 @@
#-----------------------------------------------------------------------------
set (HDF_PREFIX "H5")
include (${HDF_RESOURCES_EXT_DIR}/ConfigureChecks.cmake)
-include (${CMAKE_ROOT}/Modules/TestForSTDNamespace.cmake)
+
+if (HDF5_ENABLE_USING_MEMCHECKER)
+ set (H5_USING_MEMCHECKER 1)
+endif (HDF5_ENABLE_USING_MEMCHECKER)
#-----------------------------------------------------------------------------
# Option for --enable-strict-format-checks