diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-12 21:39:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-03-12 21:39:03 (GMT) |
| commit | 65b5c1e0645a466dbf5d163296754d12e2db53d5 (patch) | |
| tree | b84ecc7daa26285e01e002770ac9f4f13bed3a66 | |
| parent | 79568f95ab920158fdcb857c9b99592ad5300a4e (diff) | |
| parent | ab079ee6822c4ab151b0df8f9a529088607d3629 (diff) | |
| download | CMake-65b5c1e0645a466dbf5d163296754d12e2db53d5.zip CMake-65b5c1e0645a466dbf5d163296754d12e2db53d5.tar.gz CMake-65b5c1e0645a466dbf5d163296754d12e2db53d5.tar.bz2 | |
Merge branch 'property-link-depends-no-crash' into fix-automoc-no-qt
| -rw-r--r-- | Source/cmTarget.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 003f3d8..07da31f 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -4699,6 +4699,10 @@ PropertyType checkInterfacePropertyCompatibility(cmTarget *tgt, || (!impliedByUse && !explicitlySet)); cmComputeLinkInformation *info = tgt->GetLinkInformation(config); + if(!info) + { + return propContent; + } const cmComputeLinkInformation::ItemVector &deps = info->GetItems(); bool propInitialized = explicitlySet; @@ -4839,6 +4843,10 @@ bool isLinkDependentProperty(cmTarget *tgt, const std::string &p, const char *config) { cmComputeLinkInformation *info = tgt->GetLinkInformation(config); + if(!info) + { + return false; + } const cmComputeLinkInformation::ItemVector &deps = info->GetItems(); |