projects
/
platform
/
upstream
/
cmake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.8.11.2
[platform/upstream/cmake.git]
/
Source
/
cmGeneratorExpressionDAGChecker.h
diff --git
a/Source/cmGeneratorExpressionDAGChecker.h
b/Source/cmGeneratorExpressionDAGChecker.h
index
ffc84f8
..
62a5cdf
100644
(file)
--- a/
Source/cmGeneratorExpressionDAGChecker.h
+++ b/
Source/cmGeneratorExpressionDAGChecker.h
@@
-25,20
+25,33
@@
struct cmGeneratorExpressionDAGChecker
const GeneratorExpressionContent *content,
cmGeneratorExpressionDAGChecker *parent);
const GeneratorExpressionContent *content,
cmGeneratorExpressionDAGChecker *parent);
- bool check() const;
+ enum Result {
+ DAG,
+ SELF_REFERENCE,
+ CYCLIC_REFERENCE,
+ ALREADY_SEEN
+ };
+
+ Result check() const;
void reportError(cmGeneratorExpressionContext *context,
const std::string &expr);
void reportError(cmGeneratorExpressionContext *context,
const std::string &expr);
+
+ bool EvaluatingLinkLibraries();
+ bool EvaluatingIncludeDirectories() const;
+ bool EvaluatingCompileDefinitions() const;
+
private:
private:
-
bool isDAG
() const;
+
Result checkGraph
() const;
private:
const cmGeneratorExpressionDAGChecker * const Parent;
const std::string Target;
const std::string Property;
private:
const cmGeneratorExpressionDAGChecker * const Parent;
const std::string Target;
const std::string Property;
+ std::map<cmStdString, std::set<cmStdString> > Seen;
const GeneratorExpressionContent * const Content;
const cmListFileBacktrace Backtrace;
const GeneratorExpressionContent * const Content;
const cmListFileBacktrace Backtrace;
-
bool IsDAG
;
+
Result CheckResult
;
};
#endif
};
#endif