diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2014-07-15 18:19:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-07-16 15:50:33 (GMT) |
| commit | 1e005eadbc6e687217f484c0c2247a71124aa65e (patch) | |
| tree | c448270f531b477199755d9c06162c0d50a9916b | |
| parent | 44726714322ca0b75628e234229f4583a480d7ec (diff) | |
| download | CMake-1e005eadbc6e687217f484c0c2247a71124aa65e.zip CMake-1e005eadbc6e687217f484c0c2247a71124aa65e.tar.gz CMake-1e005eadbc6e687217f484c0c2247a71124aa65e.tar.bz2 | |
CTest: Fix MemoryCheckType from 'ctest -T MemCheck'
Before this commit, you would have to run ctest -S mode to get
MemoryCheckType to work. This is because CMAKE_COMMAND was not set.
The fix is to use cmSystemTools::GetCMakeCommand instead.
| -rw-r--r-- | Modules/DartConfiguration.tcl.in | 1 | ||||
| -rw-r--r-- | Source/CTest/cmCTestMemCheckHandler.cxx | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Modules/DartConfiguration.tcl.in b/Modules/DartConfiguration.tcl.in index 68fadf6..0420882 100644 --- a/Modules/DartConfiguration.tcl.in +++ b/Modules/DartConfiguration.tcl.in @@ -71,6 +71,7 @@ Compiler: @CMAKE_CXX_COMPILER@ PurifyCommand: @PURIFYCOMMAND@ ValgrindCommand: @VALGRIND_COMMAND@ ValgrindCommandOptions: @VALGRIND_COMMAND_OPTIONS@ +MemoryCheckType: @MEMORYCHECK_TYPE@ MemoryCheckCommand: @MEMORYCHECK_COMMAND@ MemoryCheckCommandOptions: @MEMORYCHECK_COMMAND_OPTIONS@ MemoryCheckSuppressionFile: @MEMORYCHECK_SUPPRESSIONS_FILE@ diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index a389359..ed57949 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -346,8 +346,8 @@ void cmCTestMemCheckHandler::PopulateCustomVectors(cmMakefile *mf) this->CTest->PopulateCustomVector(mf, "CTEST_CUSTOM_MEMCHECK_IGNORE", this->CustomTestsIgnore); - this->CTest->SetCTestConfigurationFromCMakeVariable( - mf, "CMakeCommand", "CMAKE_COMMAND"); + std::string cmake = cmSystemTools::GetCMakeCommand(); + this->CTest->SetCTestConfiguration("CMakeCommand", cmake.c_str()); } //---------------------------------------------------------------------- |