Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-17 07:11:52 +08:00
Code Issues Projects Releases Wiki Activity

cmCommandLineArgument: Provide more information syntax error messages

Browse Source
This commit is contained in:
Robert Maynard
2021-05-13 09:33:30 -04:00
parent 5aa0dec6b0
commit f78b167a23
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmCommandLineArgument.h
View File

@@ -25,7 +25,7 @@ struct cmCommandLineArgument
template <typename FunctionType> template <typename FunctionType>
cmCommandLineArgument(std::string n, Values t, FunctionType&& func) cmCommandLineArgument(std::string n, Values t, FunctionType&& func)
: InvalidSyntaxMessage(cmStrCat("Invalid syntax used with ", n)) : InvalidSyntaxMessage(cmStrCat(" is invalid syntax for ", n))
, InvalidValueMessage(cmStrCat("Invalid value used with ", n)) , InvalidValueMessage(cmStrCat("Invalid value used with ", n))
, Name(std::move(n)) , Name(std::move(n))
, Type(t) , Type(t)
@@ -36,7 +36,7 @@ struct cmCommandLineArgument
template <typename FunctionType> template <typename FunctionType>
cmCommandLineArgument(std::string n, std::string failedMsg, Values t, cmCommandLineArgument(std::string n, std::string failedMsg, Values t,
FunctionType&& func) FunctionType&& func)
: InvalidSyntaxMessage(cmStrCat("Invalid syntax used with ", n)) : InvalidSyntaxMessage(cmStrCat(" is invalid syntax for ", n))
, InvalidValueMessage(std::move(failedMsg)) , InvalidValueMessage(std::move(failedMsg))
, Name(std::move(n)) , Name(std::move(n))
, Type(t) , Type(t)
@@ -150,7 +150,8 @@ struct cmCommandLineArgument
} }
if (parseState == ParseMode::SyntaxError) { if (parseState == ParseMode::SyntaxError) {
cmSystemTools::Error(this->InvalidSyntaxMessage); cmSystemTools::Error(
cmStrCat("'", input, "'", this->InvalidSyntaxMessage));
} else if (parseState == ParseMode::ValueError) { } else if (parseState == ParseMode::ValueError) {
cmSystemTools::Error(this->InvalidValueMessage); cmSystemTools::Error(this->InvalidValueMessage);
} }

2
Tests/RunCMake/CommandLine/build-invalid-target-syntax-stderr.txt
View File

@@ -1,2 +1,2 @@
^CMake Error: Invalid syntax used with --target ^CMake Error: '--target=invalid' is invalid syntax for --target
Usage: cmake --build \[<dir> \| --preset <preset>\] \[options\] \[-- \[native-options\]\] Usage: cmake --build \[<dir> \| --preset <preset>\] \[options\] \[-- \[native-options\]\]

2
Tests/RunCMake/CommandLine/build-unknown-command-partial-match-stderr.txt
View File

@@ -1,2 +1,2 @@
^CMake Error: Invalid syntax used with --target ^CMake Error: '--targetinvalid' is invalid syntax for --target
Usage: cmake --build \[<dir> \| --preset <preset>\] \[options\] \[-- \[native-options\]\] Usage: cmake --build \[<dir> \| --preset <preset>\] \[options\] \[-- \[native-options\]\]