diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-09-16 03:03:14 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:22:27 (GMT) |
| commit | 1988255448d7e0f92f4d2f12cc8fc17b1429c328 (patch) | |
| tree | 3104927111d9ae211fc6cfb5a7756351832ffef4 | |
| parent | c1f687b1ad2fe3ed7a8a2d300f1e12df59161cbc (diff) | |
| download | CMake-1988255448d7e0f92f4d2f12cc8fc17b1429c328.zip CMake-1988255448d7e0f92f4d2f12cc8fc17b1429c328.tar.gz CMake-1988255448d7e0f92f4d2f12cc8fc17b1429c328.tar.bz2 | |
cmGeneratorTarget: Port handleSystemIncludesDep away from cmTarget.
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 5734edf..b20921f 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -511,7 +511,7 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt, const std::string& config, - cmTarget *headTarget, + cmGeneratorTarget const* headTarget, cmGeneratorExpressionDAGChecker *dagChecker, std::vector<std::string>& result, bool excludeImported) @@ -522,7 +522,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt, cmGeneratorExpression ge; cmSystemTools::ExpandListArgument(ge.Parse(dirs) ->Evaluate(mf, - config, false, headTarget, + config, false, headTarget->Target, depTgt, dagChecker), result); } if (!depTgt->IsImported() || excludeImported) @@ -536,7 +536,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt, cmGeneratorExpression ge; cmSystemTools::ExpandListArgument(ge.Parse(dirs) ->Evaluate(mf, - config, false, headTarget, + config, false, headTarget->Target, depTgt, dagChecker), result); } } @@ -869,7 +869,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir, for(std::vector<cmTarget const*>::const_iterator li = deps.begin(), le = deps.end(); li != le; ++li) { - handleSystemIncludesDep(this->Makefile, *li, config, this->Target, + handleSystemIncludesDep(this->Makefile, *li, config, this, &dagChecker, result, excludeImported); } |