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

Merge topic 'property-link-depends-no-crash' 

ab079ee Avoid crash when checking property compatibility without link info
92a2ab7 Avoid crash when checking property link dependencies without link info
This commit is contained in:
Brad King 2013-03-13 13:34:20 -04:00 committed by CMake Topic Stage
parent 7d9d0efc7b ab079ee682
commit 9a02a26702
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

@ -4753,6 +4753,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;
@ -4893,6 +4897,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();