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

Add a self-reference check for target properties. 

Prevent constructs like:

 ... INCLUDE_DIRECTORIES "$<TARGET_PROPERTY:INCLUDE_DIRECTORIES>"

Indirect self-references (cycles) are also prevented here, but
indirect generator expression references of any kind are not
possible yet anyway.
This commit is contained in:
Stephen Kelly 2012-09-18 13:53:39 +02:00 committed by Brad King
parent 7e807472d2
commit eb250cd18a
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -14,6 +14,7 @@
#include "cmGeneratorExpressionEvaluator.h" #include "cmGeneratorExpressionEvaluator.h"
#include "cmGeneratorExpressionParser.h" #include "cmGeneratorExpressionParser.h"
#include "cmGeneratorExpressionDAGChecker.h" #include "cmGeneratorExpressionDAGChecker.h"
#include "cmGeneratorExpression.h"
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static void reportError(cmGeneratorExpressionContext *context, static void reportError(cmGeneratorExpressionContext *context,
@ -264,7 +265,8 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
std::string Evaluate(const std::vector<std::string> &parameters, std::string Evaluate(const std::vector<std::string> &parameters,
cmGeneratorExpressionContext *context, cmGeneratorExpressionContext *context,
const GeneratorExpressionContent *content, const GeneratorExpressionContent *content,
cmGeneratorExpressionDAGChecker *) const cmGeneratorExpressionDAGChecker *dagCheckerParent
) const
{ {
if (parameters.size() != 1 && parameters.size() != 2) if (parameters.size() != 1 && parameters.size() != 2)
{ {
@ -289,6 +291,19 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
} }
propertyName = parameters.at(1); propertyName = parameters.at(1);
} }
cmGeneratorExpressionDAGChecker dagChecker(context->Backtrace,
target->GetName(),
propertyName,
content,
dagCheckerParent);
if (!dagChecker.check())
{
dagChecker.reportError(context, content->GetOriginalExpression());
return std::string();
}
const char *prop = target->GetProperty(propertyName.c_str()); const char *prop = target->GetProperty(propertyName.c_str());
return prop ? prop : ""; return prop ? prop : "";
} }