diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-25 13:00:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-25 13:00:16 (GMT) |
| commit | 7c2979a5c5401da2e4c2c508abf173a4b9907bb2 (patch) | |
| tree | 46e467a5db7ed8b2040b0652fc71f64a300ba756 /Source/cmSystemTools.cxx | |
| parent | 62bdc587ebbf3e607faef5e2f005cf88d11da32f (diff) | |
| parent | 0a8e23ad6e7a634d2e66537b3faea179436efcc6 (diff) | |
| download | CMake-7c2979a5c5401da2e4c2c508abf173a4b9907bb2.zip CMake-7c2979a5c5401da2e4c2c508abf173a4b9907bb2.tar.gz CMake-7c2979a5c5401da2e4c2c508abf173a4b9907bb2.tar.bz2 | |
Merge topic 'rc-missing-better-error'
0a8e23ad Windows: Improve link-time error messages when rc or mt fail
c2d6835c cmSystemTools: Teach RunSingleCommand another way to report exceptions
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1260
Diffstat (limited to 'Source/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 58adc43..4fd10a4 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -803,6 +803,8 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command, } if (captureStdErr) { captureStdErr->append(exception_str, strlen(exception_str)); + } else if (captureStdOut) { + captureStdOut->append(exception_str, strlen(exception_str)); } result = false; } else if (cmsysProcess_GetState(cp) == cmsysProcess_State_Error) { @@ -812,6 +814,8 @@ bool cmSystemTools::RunSingleCommand(std::vector<std::string> const& command, } if (captureStdErr) { captureStdErr->append(error_str, strlen(error_str)); + } else if (captureStdOut) { + captureStdOut->append(error_str, strlen(error_str)); } result = false; } else if (cmsysProcess_GetState(cp) == cmsysProcess_State_Expired) { |