diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-18 09:42:00 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-23 08:42:24 (GMT) |
| commit | 8dfdf1c734af19a1e49efa4568e5e1f8fc7cb2f2 (patch) | |
| tree | b0a35c218afa9e302c5ed11a512fc35f7554b4f2 /Source/cmGeneratorExpressionDAGChecker.cxx | |
| parent | 98a672528d7e6c192fc75abb10161121c8b28073 (diff) | |
| download | CMake-8dfdf1c734af19a1e49efa4568e5e1f8fc7cb2f2.zip CMake-8dfdf1c734af19a1e49efa4568e5e1f8fc7cb2f2.tar.gz CMake-8dfdf1c734af19a1e49efa4568e5e1f8fc7cb2f2.tar.bz2 | |
Fix the tests for evaluating includes and defines.
We should also check whether the INTERFACE_ variant of a property
is being read, and in the case of the compile definitions, we should
test the _<CONFIG> suffixed variants. That is already available
through the use of the methods.
This way, we use the ALREADY_SEEN optimization when evaluating
the includes of a target in 'external' generator expressions, ie, those
used in a add_custom_command invokation, as opposed to evaluating the
INCLUDE_DIRECTORIES of a target itself via GetIncludeDirectories.
Diffstat (limited to 'Source/cmGeneratorExpressionDAGChecker.cxx')
| -rw-r--r-- | Source/cmGeneratorExpressionDAGChecker.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpressionDAGChecker.cxx b/Source/cmGeneratorExpressionDAGChecker.cxx index f8776d9..5cb50b9 100644 --- a/Source/cmGeneratorExpressionDAGChecker.cxx +++ b/Source/cmGeneratorExpressionDAGChecker.cxx @@ -33,8 +33,8 @@ cmGeneratorExpressionDAGChecker::cmGeneratorExpressionDAGChecker( } this->CheckResult = this->checkGraph(); - if (CheckResult == DAG && (top->Property == "INCLUDE_DIRECTORIES" - || top->Property == "COMPILE_DEFINITIONS") ) + if (CheckResult == DAG && (top->EvaluatingIncludeDirectories() + || top->EvaluatingCompileDefinitions())) { std::map<cmStdString, std::set<cmStdString> >::const_iterator it = top->Seen.find(target); |