From 298f226cb4f63610cd8a7a851c0867a41c5d422b Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 29 Jun 2022 15:51:50 -0400 Subject: cmExportCommand: Use cm::optional for keyword argument presence --- Source/cmExportCommand.cxx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index 9a21a98..198874e 100644 --- a/Source/cmExportCommand.cxx +++ b/Source/cmExportCommand.cxx @@ -7,8 +7,7 @@ #include #include -#include -#include +#include #include #include "cmsys/RegularExpression.hxx" @@ -58,7 +57,7 @@ bool cmExportCommand(std::vector const& args, struct Arguments { std::string ExportSetName; - std::vector Targets; + cm::optional> Targets; std::string Namespace; std::string Filename; std::string AndroidMKFile; @@ -80,9 +79,7 @@ bool cmExportCommand(std::vector const& args, } std::vector unknownArgs; - std::vector keywordsMissingValue; - Arguments const arguments = - parser.Parse(args, &unknownArgs, &keywordsMissingValue); + Arguments const arguments = parser.Parse(args, &unknownArgs); if (!unknownArgs.empty()) { status.SetError("Unknown argument: \"" + unknownArgs.front() + "\"."); @@ -146,9 +143,8 @@ bool cmExportCommand(std::vector const& args, return false; } exportSet = &it->second; - } else if (!arguments.Targets.empty() || - cm::contains(keywordsMissingValue, "TARGETS")) { - for (std::string const& currentTarget : arguments.Targets) { + } else if (arguments.Targets) { + for (std::string const& currentTarget : *arguments.Targets) { if (mf.IsAlias(currentTarget)) { std::ostringstream e; e << "given ALIAS target \"" << currentTarget -- cgit v0.12