mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmFileCommand: Capture list of parsed keywords via binding

Browse Source
This commit is contained in:
Brad King
2022-07-20 15:17:57 -04:00
parent f7e81802f2
commit 6ecd741b5f
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmFileCommand.cxx
View File

@@ -2482,6 +2482,7 @@ bool HandleGenerateCommand(std::vector<std::string> const& args,
bool NoSourcePermissions = false;
bool UseSourcePermissions = false;
ArgumentParser::NonEmpty<std::vector<std::string>> FilePermissions;
std::vector<cm::string_view> ParsedKeywords;
};
static auto const parser =
@@ -2494,12 +2495,12 @@ bool HandleGenerateCommand(std::vector<std::string> const& args,
.Bind("NO_SOURCE_PERMISSIONS"_s, &Arguments::NoSourcePermissions)
.Bind("USE_SOURCE_PERMISSIONS"_s, &Arguments::UseSourcePermissions)
.Bind("FILE_PERMISSIONS"_s, &Arguments::FilePermissions)
.Bind("NEWLINE_STYLE"_s, &Arguments::NewLineStyle);
.Bind("NEWLINE_STYLE"_s, &Arguments::NewLineStyle)
.BindParsedKeywords(&Arguments::ParsedKeywords);
std::vector<std::string> unparsedArguments;
std::vector<cm::string_view> parsedKeywords;
Arguments const arguments = parser.Parse(
cmMakeRange(args).advance(1), &unparsedArguments, &parsedKeywords);
Arguments const arguments =
parser.Parse(cmMakeRange(args).advance(1), &unparsedArguments);
if (arguments.MaybeReportError(status.GetMakefile())) {
return true;
@@ -2510,7 +2511,7 @@ bool HandleGenerateCommand(std::vector<std::string> const& args,
return false;
}
if (!arguments.Output || parsedKeywords[0] != "OUTPUT"_s) {
if (!arguments.Output || arguments.ParsedKeywords[0] != "OUTPUT"_s) {
status.SetError("GENERATE requires OUTPUT as first option.");
return false;
}
@@ -2520,8 +2521,8 @@ bool HandleGenerateCommand(std::vector<std::string> const& args,
status.SetError("GENERATE requires INPUT or CONTENT option.");
return false;
}
const bool inputIsContent = parsedKeywords[1] == "CONTENT"_s;
if (!inputIsContent && parsedKeywords[1] == "INPUT") {
const bool inputIsContent = arguments.ParsedKeywords[1] == "CONTENT"_s;
if (!inputIsContent && arguments.ParsedKeywords[1] == "INPUT") {
status.SetError("Unknown argument to GENERATE subcommand.");
}
std::string const& input =