diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-03-31 14:02:24 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-03-31 14:02:24 (GMT) |
| commit | 8e41b14811129b60914b0db51c34e76e1fb0b7e7 (patch) | |
| tree | 28cfd5aa35bb8cdd10fe66855991fcec1e47fe54 /config/cmake | |
| parent | 018f92063e4b736819a1b11db0bdfcb684bcc2f4 (diff) | |
| download | hdf5-8e41b14811129b60914b0db51c34e76e1fb0b7e7.zip hdf5-8e41b14811129b60914b0db51c34e76e1fb0b7e7.tar.gz hdf5-8e41b14811129b60914b0db51c34e76e1fb0b7e7.tar.bz2 | |
[svn-r29601] Cleanup case of CMake commands in tools.
Update CTestCustom file for new tests.
Add connection from HDF5_ENABLE_USING_MEMCHECKER cmake option to library define USING_MEMCHECKER.
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/CTestCustom.cmake | 1 | ||||
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 5 |
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 |