kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename the method determining if a genex accepts arbitrary content. 

The meaning of this will be expanded to generator expressions with
more than a single parameter.
This commit is contained in:
Stephen Kelly 2013-04-25 13:28:57 +02:00
parent dc742fe4be
commit bd638ee20f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -51,7 +51,7 @@ struct cmGeneratorExpressionNode
virtual bool RequiresLiteralInput() const { return false; } virtual bool RequiresLiteralInput() const { return false; }
virtual bool AcceptsSingleArbitraryContentParameter() const virtual bool AcceptsArbitraryContentParameter() const
{ return false; } { return false; }
virtual int NumExpectedParameters() const { return 1; } virtual int NumExpectedParameters() const { return 1; }
@ -70,7 +70,7 @@ static const struct ZeroNode : public cmGeneratorExpressionNode
virtual bool GeneratesContent() const { return false; } virtual bool GeneratesContent() const { return false; }
virtual bool AcceptsSingleArbitraryContentParameter() const { return true; } virtual bool AcceptsArbitraryContentParameter() const { return true; }
std::string Evaluate(const std::vector<std::string> &, std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *, cmGeneratorExpressionContext *,
@ -87,7 +87,7 @@ static const struct OneNode : public cmGeneratorExpressionNode
{ {
OneNode() {} OneNode() {}
virtual bool AcceptsSingleArbitraryContentParameter() const { return true; } virtual bool AcceptsArbitraryContentParameter() const { return true; }
std::string Evaluate(const std::vector<std::string> &, std::string Evaluate(const std::vector<std::string> &,
cmGeneratorExpressionContext *, cmGeneratorExpressionContext *,
@ -600,7 +600,7 @@ static const struct TargetNameNode : public cmGeneratorExpressionNode
virtual bool GeneratesContent() const { return true; } virtual bool GeneratesContent() const { return true; }
virtual bool AcceptsSingleArbitraryContentParameter() const { return true; } virtual bool AcceptsArbitraryContentParameter() const { return true; }
virtual bool RequiresLiteralInput() const { return true; } virtual bool RequiresLiteralInput() const { return true; }
std::string Evaluate(const std::vector<std::string> &parameters, std::string Evaluate(const std::vector<std::string> &parameters,
@ -1075,7 +1075,8 @@ std::string GeneratorExpressionContent::Evaluate(
if (!node->GeneratesContent()) if (!node->GeneratesContent())
{ {
if (node->AcceptsSingleArbitraryContentParameter()) if (node->NumExpectedParameters() == 1
&& node->AcceptsArbitraryContentParameter())
{ {
if (this->ParamChildren.empty()) if (this->ParamChildren.empty())
{ {
@ -1092,7 +1093,8 @@ std::string GeneratorExpressionContent::Evaluate(
return std::string(); return std::string();
} }
if (node->AcceptsSingleArbitraryContentParameter()) if (node->NumExpectedParameters() == 1
&& node->AcceptsArbitraryContentParameter())
{ {
return this->ProcessArbitraryContent(node, identifier, context, return this->ProcessArbitraryContent(node, identifier, context,
dagChecker, dagChecker,