diff options
| author | Brad King <brad.king@kitware.com> | 2016-09-21 12:47:51 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-21 12:47:51 (GMT) |
| commit | 2c2ffd3874f749979d723d7a788d45e3830952d6 (patch) | |
| tree | b93129d8c486047de6ea6e7f0143560d753d96a5 /Source/CTest/cmCTestUploadCommand.cxx | |
| parent | eca2af6e66343c51389f6605df79f7e6ce60cf37 (diff) | |
| parent | adf1e32fa2da7a7131e65809fe20111b9611e87d (diff) | |
| download | CMake-2c2ffd3874f749979d723d7a788d45e3830952d6.zip CMake-2c2ffd3874f749979d723d7a788d45e3830952d6.tar.gz CMake-2c2ffd3874f749979d723d7a788d45e3830952d6.tar.bz2 | |
Merge topic 'ctest-capture-error'
adf1e32f Help: Add notes for topic 'ctest-capture-error'
d328dc68 CTest: Add CAPTURE_CMAKE_ERROR val to `ctest_*` commands
9ac2e189 ctest_coverage: If gcov is not found just warn, not error
Diffstat (limited to 'Source/CTest/cmCTestUploadCommand.cxx')
| -rw-r--r-- | Source/CTest/cmCTestUploadCommand.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestUploadCommand.cxx b/Source/CTest/cmCTestUploadCommand.cxx index 5ea637e..c4458dd 100644 --- a/Source/CTest/cmCTestUploadCommand.cxx +++ b/Source/CTest/cmCTestUploadCommand.cxx @@ -45,11 +45,19 @@ bool cmCTestUploadCommand::CheckArgumentKeyword(std::string const& arg) this->Quiet = true; return true; } + if (arg == "CAPTURE_CMAKE_ERROR") { + this->ArgumentDoing = ArgumentDoingCaptureCMakeError; + return true; + } return false; } bool cmCTestUploadCommand::CheckArgumentValue(std::string const& arg) { + if (this->ArgumentDoing == ArgumentDoingCaptureCMakeError) { + this->Values[ct_CAPTURE_CMAKE_ERROR] = arg.c_str(); + return true; + } if (this->ArgumentDoing == ArgumentDoingFiles) { if (cmSystemTools::FileExists(arg.c_str())) { this->Files.insert(arg); |