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

Genex: Fix case of methods in the dag checker.

This commit is contained in:
Stephen Kelly 2014-01-05 05:25:09 +01:00
parent 646c6ec2f9
commit 6eb3218105
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmGeneratorExpressionDAGChecker.cxx
View File

@ -31,7 +31,7 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
top = p; top = p;
p = p->Parent; p = p->Parent;
} }
this->CheckResult = this->checkGraph(); this->CheckResult = this->CheckGraph();
#define TEST_TRANSITIVE_PROPERTY_METHOD(METHOD) \ #define TEST_TRANSITIVE_PROPERTY_METHOD(METHOD) \
top->METHOD () || top->METHOD () ||
@ -61,13 +61,13 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker(
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmGeneratorExpressionDAGChecker::Result cmGeneratorExpressionDAGChecker::Result
cmGeneratorExpressionDAGChecker::check() const cmGeneratorExpressionDAGChecker::Check() const
{ {
return this->CheckResult; return this->CheckResult;
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGeneratorExpressionDAGChecker::reportError( void cmGeneratorExpressionDAGChecker::ReportError(
cmGeneratorExpressionContext *context, cmGeneratorExpressionContext *context,
const std::string &expr) const std::string &expr)
{ {
@ -125,7 +125,7 @@ void cmGeneratorExpressionDAGChecker::reportError(
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
cmGeneratorExpressionDAGChecker::Result cmGeneratorExpressionDAGChecker::Result
cmGeneratorExpressionDAGChecker::checkGraph() const cmGeneratorExpressionDAGChecker::CheckGraph() const
{ {
const cmGeneratorExpressionDAGChecker *parent = this->Parent; const cmGeneratorExpressionDAGChecker *parent = this->Parent;
while (parent) while (parent)

6
Source/cmGeneratorExpressionDAGChecker.h
View File

@ -52,9 +52,9 @@ struct cmGeneratorExpressionDAGChecker
ALREADY_SEEN ALREADY_SEEN
}; };
Result check() const; Result Check() const;
void reportError(cmGeneratorExpressionContext *context, void ReportError(cmGeneratorExpressionContext *context,
const std::string &expr); const std::string &expr);
bool EvaluatingLinkLibraries(const char *tgt = 0); bool EvaluatingLinkLibraries(const char *tgt = 0);
@ -71,7 +71,7 @@ struct cmGeneratorExpressionDAGChecker
{ this->TransitivePropertiesOnly = true; } { this->TransitivePropertiesOnly = true; }
private: private:
Result checkGraph() const; Result CheckGraph() const;
private: private:
const cmGeneratorExpressionDAGChecker * const Parent; const cmGeneratorExpressionDAGChecker * const Parent;

4
Source/cmGeneratorExpressionEvaluator.cxx
View File

@ -957,10 +957,10 @@ static const struct TargetPropertyNode : public cmGeneratorExpressionNode
content, content,
dagCheckerParent); dagCheckerParent);
switch (dagChecker.check()) switch (dagChecker.Check())
{ {
case cmGeneratorExpressionDAGChecker::SELF_REFERENCE: case cmGeneratorExpressionDAGChecker::SELF_REFERENCE:
dagChecker.reportError(context, content->GetOriginalExpression()); dagChecker.ReportError(context, content->GetOriginalExpression());
return std::string(); return std::string();
case cmGeneratorExpressionDAGChecker::CYCLIC_REFERENCE: case cmGeneratorExpressionDAGChecker::CYCLIC_REFERENCE:
// No error. We just skip cyclic references. // No error. We just skip cyclic references.