diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-10 09:40:50 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-12 16:39:58 (GMT) |
| commit | 5fd2f43f646d6fa3755d83d6b6f2592a54425071 (patch) | |
| tree | a675a74206d3c126f05bef88ceef01c1874645a5 /Source/cmGeneratorTarget.cxx | |
| parent | f7acd7421521b3a961480a37077c3814dc684d30 (diff) | |
| download | CMake-5fd2f43f646d6fa3755d83d6b6f2592a54425071.zip CMake-5fd2f43f646d6fa3755d83d6b6f2592a54425071.tar.gz CMake-5fd2f43f646d6fa3755d83d6b6f2592a54425071.tar.bz2 | |
cmGeneratorTarget: Port handleSystemIncludesDep to cmGeneratorTarget.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 7ec25f3..ace069f 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -510,7 +510,8 @@ cmGeneratorTarget::GetSourceDepends(cmSourceFile const* sf) const return 0; } -static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt, +static void handleSystemIncludesDep(cmMakefile *mf, + cmGeneratorTarget const* depTgt, const std::string& config, cmGeneratorTarget const* headTarget, cmGeneratorExpressionDAGChecker *dagChecker, @@ -524,7 +525,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt, cmSystemTools::ExpandListArgument(ge.Parse(dirs) ->Evaluate(mf, config, false, headTarget->Target, - depTgt, dagChecker), result); + depTgt->Target, dagChecker), result); } if (!depTgt->IsImported() || excludeImported) { @@ -538,7 +539,7 @@ static void handleSystemIncludesDep(cmMakefile *mf, cmTarget const* depTgt, cmSystemTools::ExpandListArgument(ge.Parse(dirs) ->Evaluate(mf, config, false, headTarget->Target, - depTgt, dagChecker), result); + depTgt->Target, dagChecker), result); } } @@ -888,7 +889,7 @@ bool cmGeneratorTarget::IsSystemIncludeDirectory(const std::string& dir, for(std::vector<cmGeneratorTarget const*>::const_iterator li = deps.begin(), le = deps.end(); li != le; ++li) { - handleSystemIncludesDep(this->Makefile, (*li)->Target, config, this, + handleSystemIncludesDep(this->Makefile, *li, config, this, &dagChecker, result, excludeImported); } |