kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'property-link-depends-no-crash' into fix-automoc-no-qt

This commit is contained in:
Brad King 2013-03-12 17:39:03 -04:00
parent 79568f95ab ab079ee682
commit 65b5c1e064
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmTarget.cxx
View File

@ -4699,6 +4699,10 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget *tgt,
|| (!impliedByUse && !explicitlySet)); || (!impliedByUse && !explicitlySet));
cmComputeLinkInformation *info = tgt->GetLinkInformation(config); cmComputeLinkInformation *info = tgt->GetLinkInformation(config);
if(!info)
{
return propContent;
}
const cmComputeLinkInformation::ItemVector &deps = info->GetItems(); const cmComputeLinkInformation::ItemVector &deps = info->GetItems();
bool propInitialized = explicitlySet; bool propInitialized = explicitlySet;
@ -4839,6 +4843,10 @@ bool isLinkDependentProperty(cmTarget *tgt, const std::string &p,
const char *config) const char *config)
{ {
cmComputeLinkInformation *info = tgt->GetLinkInformation(config); cmComputeLinkInformation *info = tgt->GetLinkInformation(config);
if(!info)
{
return false;
}
const cmComputeLinkInformation::ItemVector &deps = info->GetItems(); const cmComputeLinkInformation::ItemVector &deps = info->GetItems();