diff options
| author | Brad King <brad.king@kitware.com> | 2022-07-18 21:12:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-07-22 14:32:24 (GMT) |
| commit | e56108f629f0719429487b51ff952e80138949fa (patch) | |
| tree | 0a22fd8fbaaeb58721b911a160552d6964570465 | |
| parent | b7c82b26b03349d1201a24acbe198ee1bd00ee3e (diff) | |
| download | CMake-e56108f629f0719429487b51ff952e80138949fa.zip CMake-e56108f629f0719429487b51ff952e80138949fa.tar.gz CMake-e56108f629f0719429487b51ff952e80138949fa.tar.bz2 | |
cmExecuteProcessCommand: Report keyword errors via argument parser results
| -rw-r--r-- | Source/cmExecuteProcessCommand.cxx | 12 | ||||
| -rw-r--r-- | Tests/RunCMake/execute_process/EchoCommand3-stderr.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/execute_process/EncodingMissing-stderr.txt | 5 |
3 files changed, 11 insertions, 10 deletions
diff --git a/Source/cmExecuteProcessCommand.cxx b/Source/cmExecuteProcessCommand.cxx index af56e2d..7fbd826 100644 --- a/Source/cmExecuteProcessCommand.cxx +++ b/Source/cmExecuteProcessCommand.cxx @@ -47,7 +47,7 @@ bool cmExecuteProcessCommand(std::vector<std::string> const& args, return false; } - struct Arguments + struct Arguments : public ArgumentParser::ParseResult { std::vector<std::vector<std::string>> Commands; std::string OutputVariable; @@ -95,14 +95,10 @@ bool cmExecuteProcessCommand(std::vector<std::string> const& args, .Bind("COMMAND_ERROR_IS_FATAL"_s, &Arguments::CommandErrorIsFatal); std::vector<std::string> unparsedArguments; - std::vector<cm::string_view> keywordsMissingValue; - Arguments const arguments = - parser.Parse(args, &unparsedArguments, &keywordsMissingValue); + Arguments const arguments = parser.Parse(args, &unparsedArguments); - if (!keywordsMissingValue.empty()) { - status.SetError(cmStrCat(" called with no value for ", - keywordsMissingValue.front(), ".")); - return false; + if (arguments.MaybeReportError(status.GetMakefile())) { + return true; } if (!unparsedArguments.empty()) { status.SetError(" given unknown argument \"" + unparsedArguments.front() + diff --git a/Tests/RunCMake/execute_process/EchoCommand3-stderr.txt b/Tests/RunCMake/execute_process/EchoCommand3-stderr.txt index e27f1e6..62cad52 100644 --- a/Tests/RunCMake/execute_process/EchoCommand3-stderr.txt +++ b/Tests/RunCMake/execute_process/EchoCommand3-stderr.txt @@ -1,2 +1,4 @@ CMake Error at .*EchoCommand.cmake:.*\(execute_process\): - execute_process called with no value for COMMAND_ECHO. + Error after keyword "COMMAND_ECHO": + + missing required value diff --git a/Tests/RunCMake/execute_process/EncodingMissing-stderr.txt b/Tests/RunCMake/execute_process/EncodingMissing-stderr.txt index 1a69579..7f85654 100644 --- a/Tests/RunCMake/execute_process/EncodingMissing-stderr.txt +++ b/Tests/RunCMake/execute_process/EncodingMissing-stderr.txt @@ -1,4 +1,7 @@ ^CMake Error at EncodingMissing.cmake:[0-9]+ \(execute_process\): - execute_process called with no value for ENCODING. + Error after keyword "ENCODING": + + missing required value + Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\)$ |