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

cmDefinePropertyCommand: Refactor to use cmArgumentParser

Browse Source
This commit is contained in:
Kyle Edwards
2022-01-18 14:47:39 -05:00
parent a2e42a577b
commit 7d26baff46
1 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
Source/cmDefinePropertyCommand.cxx
View File

@@ -2,6 +2,10 @@
file Copyright.txt or https://cmake.org/licensing for details. */
#include "cmDefinePropertyCommand.h"
#include <cm/string_view>
#include <cmext/string_view>
#include "cmArgumentParser.h"
#include "cmExecutionStatus.h"
#include "cmMakefile.h"
#include "cmProperty.h"
@@ -44,37 +48,21 @@ bool cmDefinePropertyCommand(std::vector<std::string> const& args,
// Parse remaining arguments.
bool inherited = false;
std::string PropertyName;
std::string BriefDocs;
std::string FullDocs;
enum Doing
{
DoingNone,
DoingProperty,
DoingBrief,
DoingFull
};
Doing doing = DoingNone;
for (unsigned int i = 1; i < args.size(); ++i) {
if (args[i] == "PROPERTY") {
doing = DoingProperty;
} else if (args[i] == "BRIEF_DOCS") {
doing = DoingBrief;
} else if (args[i] == "FULL_DOCS") {
doing = DoingFull;
} else if (args[i] == "INHERITED") {
doing = DoingNone;
inherited = true;
} else if (doing == DoingProperty) {
doing = DoingNone;
PropertyName = args[i];
} else if (doing == DoingBrief) {
BriefDocs += args[i];
} else if (doing == DoingFull) {
FullDocs += args[i];
} else {
status.SetError(cmStrCat("given invalid argument \"", args[i], "\"."));
return false;
}
std::vector<std::string> BriefDocs;
std::vector<std::string> FullDocs;
cmArgumentParser<void> parser;
parser.Bind("PROPERTY"_s, PropertyName);
parser.Bind("BRIEF_DOCS"_s, BriefDocs);
parser.Bind("FULL_DOCS"_s, FullDocs);
parser.Bind("INHERITED"_s, inherited);
std::vector<std::string> invalidArgs;
parser.Parse(cmMakeRange(args).advance(1), &invalidArgs);
if (!invalidArgs.empty()) {
status.SetError(
cmStrCat("given invalid argument \"", invalidArgs.front(), "\"."));
return false;
}
// Make sure a property name was found.
@@ -95,7 +83,8 @@ bool cmDefinePropertyCommand(std::vector<std::string> const& args,
// Actually define the property.
status.GetMakefile().GetState()->DefineProperty(
PropertyName, scope, BriefDocs, FullDocs, inherited);
PropertyName, scope, cmJoin(BriefDocs, ""), cmJoin(FullDocs, ""),
inherited);
return true;
}