mirror of
https://github.com/reactos/CMake.git
synced 2024-11-24 03:59:58 +00:00
Merge branch 'property-link-depends-no-crash' into fix-automoc-no-qt
This commit is contained in:
commit
65b5c1e064
@ -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();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user