summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2011-08-16 21:02:43 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-08-16 21:02:43 (GMT)
commit522c263d9dfafb285395d806cdec67266a84bb75 (patch)
tree7927cc843bcee771f58e00916103189e35796a58
parente1d4a73be0d43e6752fbe478789dba86f5eff9ba (diff)
parent8ee9bbbd0ca5aab5bceb2dc9dda041e5745ffc19 (diff)
downloadCMake-522c263d9dfafb285395d806cdec67266a84bb75.zip
CMake-522c263d9dfafb285395d806cdec67266a84bb75.tar.gz
CMake-522c263d9dfafb285395d806cdec67266a84bb75.tar.bz2
Merge topic 'fix-imported-target-depend-crash'
8ee9bbb Do not crash when an imported target depends on a missing target
-rw-r--r--Source/cmComputeTargetDepends.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index a4ca363..3a0ed06 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -276,9 +276,11 @@ void cmComputeTargetDepends::AddTargetDepend(int depender_index,
for(std::set<cmStdString>::const_iterator i = utils.begin();
i != utils.end(); ++i)
{
- cmTarget* transitive_dependee =
- dependee->GetMakefile()->FindTargetToUse(i->c_str());
- this->AddTargetDepend(depender_index, transitive_dependee, false);
+ if(cmTarget* transitive_dependee =
+ dependee->GetMakefile()->FindTargetToUse(i->c_str()))
+ {
+ this->AddTargetDepend(depender_index, transitive_dependee, false);
+ }
}
}
else