summaryrefslogtreecommitdiffstats
path: root/Source/cmComputeLinkDepends.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-07 23:18:42 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-12 16:39:58 (GMT)
commitceb35b63a796235bb76284b3fb4046208365e23f (patch)
treef023761134dfe519e9faa11139b844d141c582bf /Source/cmComputeLinkDepends.cxx
parentbf2d061ad37088be9ea6f135a980d14c4e76064b (diff)
downloadCMake-ceb35b63a796235bb76284b3fb4046208365e23f.zip
CMake-ceb35b63a796235bb76284b3fb4046208365e23f.tar.gz
CMake-ceb35b63a796235bb76284b3fb4046208365e23f.tar.bz2
cmLinkItem: Port to cmGeneratorTarget.
Diffstat (limited to 'Source/cmComputeLinkDepends.cxx')
-rw-r--r--Source/cmComputeLinkDepends.cxx10
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx
index 5604c53..22843f1 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -320,8 +320,7 @@ int cmComputeLinkDepends::AddLinkEntry(cmLinkItem const& item)
int index = lei->second;
LinkEntry& entry = this->EntryList[index];
entry.Item = item;
- entry.Target =
- item.Target ? this->GlobalGenerator->GetGeneratorTarget(item.Target) : 0;
+ entry.Target = item.Target;
entry.IsFlag = (!entry.Target && item[0] == '-' && item[1] != 'l' &&
item.substr(0, 10) != "-framework");
@@ -443,9 +442,7 @@ void cmComputeLinkDepends::HandleSharedDependency(SharedDepEntry const& dep)
// Initialize the item entry.
LinkEntry& entry = this->EntryList[lei->second];
entry.Item = dep.Item;
- entry.Target =
- dep.Item.Target ?
- this->GlobalGenerator->GetGeneratorTarget(dep.Item.Target) : 0;
+ entry.Target = dep.Item.Target;
// This item was added specifically because it is a dependent
// shared library. It may get special treatment
@@ -983,7 +980,6 @@ void cmComputeLinkDepends::CheckWrongConfigItem(cmLinkItem const& item)
// directories.
if(item.Target && !item.Target->IsImported())
{
- this->OldWrongConfigItems.insert(
- this->GlobalGenerator->GetGeneratorTarget(item.Target));
+ this->OldWrongConfigItems.insert(item.Target);
}
}