summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorTarget.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-10 16:41:51 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-15 20:40:56 (GMT)
commitc4ae157865291d73113f81d4c9a9c2dd86598efc (patch)
tree8163dbedec892a7ea48b3548a9b17a954705e10c /Source/cmGeneratorTarget.cxx
parent6d27a3dbfbfb8852d8b8ff5c6fc7432eebc604e5 (diff)
downloadCMake-c4ae157865291d73113f81d4c9a9c2dd86598efc.zip
CMake-c4ae157865291d73113f81d4c9a9c2dd86598efc.tar.gz
CMake-c4ae157865291d73113f81d4c9a9c2dd86598efc.tar.bz2
Genex: Port some access API to cmGeneratorTarget.
Diffstat (limited to 'Source/cmGeneratorTarget.cxx')
-rw-r--r--Source/cmGeneratorTarget.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 6bebc2b..ca91f53 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -2173,9 +2173,9 @@ cmTargetTraceDependencies
si != sources.end(); ++si)
{
cmSourceFile* sf = *si;
- const std::set<cmTarget const*> tgts =
+ const std::set<cmGeneratorTarget const*> tgts =
this->GlobalGenerator->GetFilenameTargetDepends(sf);
- if (tgts.find(this->Target) != tgts.end())
+ if (tgts.find(this->GeneratorTarget) != tgts.end())
{
std::ostringstream e;
e << "Evaluation output file\n \"" << sf->GetFullPath()
@@ -2353,7 +2353,7 @@ cmTargetTraceDependencies
cmGeneratorExpression ge(cc.GetBacktrace());
// Add target-level dependencies referenced by generator expressions.
- std::set<cmTarget*> targets;
+ std::set<cmGeneratorTarget*> targets;
for(cmCustomCommandLines::const_iterator cit = cc.GetCommandLines().begin();
cit != cc.GetCommandLines().end(); ++cit)
@@ -2379,12 +2379,12 @@ cmTargetTraceDependencies
const cmsys::auto_ptr<cmCompiledGeneratorExpression> cge
= ge.Parse(*cli);
cge->Evaluate(this->GeneratorTarget->GetLocalGenerator(), "", true);
- std::set<cmTarget*> geTargets = cge->GetTargets();
+ std::set<cmGeneratorTarget*> geTargets = cge->GetTargets();
targets.insert(geTargets.begin(), geTargets.end());
}
}
- for(std::set<cmTarget*>::iterator ti = targets.begin();
+ for(std::set<cmGeneratorTarget*>::iterator ti = targets.begin();
ti != targets.end(); ++ti)
{
this->Target->AddUtility((*ti)->GetName());
@@ -5412,7 +5412,7 @@ void cmGeneratorTarget::ComputeLinkImplementationLibraries(
this->LinkImplicitNullProperties.insert(*it);
}
}
- cge->GetMaxLanguageStandard(this->Target,
+ cge->GetMaxLanguageStandard(this,
this->MaxLanguageStandards);
}