summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2019-12-12 16:54:46 (GMT)
committerKitware Robot <kwrobot@kitware.com>2019-12-12 16:54:54 (GMT)
commit0e0571599fee709e3c353c521b617a0df149a672 (patch)
tree3d1045e213e9a85921364d3dac04bf338dcb8fa0 /Modules
parent81f5fe8463cd96a782793c99440d626722eed793 (diff)
parent676befdf524a6eaa234103c670b9c7017726b8ac (diff)
downloadCMake-0e0571599fee709e3c353c521b617a0df149a672.zip
CMake-0e0571599fee709e3c353c521b617a0df149a672.tar.gz
CMake-0e0571599fee709e3c353c521b617a0df149a672.tar.bz2
Merge topic 'ctest-drmemory-support'
676befdf52 ctest: add support for memcheck using Dr. Memory 2db0a65f56 cmCTestMemCheckHandler.cxx: minor refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4119
Diffstat (limited to 'Modules')
-rw-r--r--Modules/CTest.cmake2
-rw-r--r--Modules/DartConfiguration.tcl.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/Modules/CTest.cmake b/Modules/CTest.cmake
index 3a111ca..1a51bc8 100644
--- a/Modules/CTest.cmake
+++ b/Modules/CTest.cmake
@@ -174,7 +174,7 @@ if(BUILD_TESTING)
"How many times to retry timed-out CTest submissions.")
find_program(MEMORYCHECK_COMMAND
- NAMES purify valgrind boundscheck
+ NAMES purify valgrind boundscheck drmemory
PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Rational Software\\Purify\\Setup;InstallFolder]"
DOC "Path to the memory checking command, used for memory error detection."
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in
index e4513b3..086ba07 100644
--- a/Modules/DartConfiguration.tcl.in
+++ b/Modules/DartConfiguration.tcl.in
@@ -69,6 +69,8 @@ CompilerVersion: @CMAKE_CXX_COMPILER_VERSION@
PurifyCommand: @PURIFYCOMMAND@
ValgrindCommand: @VALGRIND_COMMAND@
ValgrindCommandOptions: @VALGRIND_COMMAND_OPTIONS@
+DrMemoryCommand: @DRMEMORY_COMMAND@
+DrMemoryCommandOptions: @DRMEMORY_COMMAND_OPTIONS@
MemoryCheckType: @MEMORYCHECK_TYPE@
MemoryCheckSanitizerOptions: @MEMORYCHECK_SANITIZER_OPTIONS@
MemoryCheckCommand: @MEMORYCHECK_COMMAND@