summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-11-09 15:06:33 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-11-09 15:06:33 (GMT)
commited484544cbf39ffefe1898b8255a5189062e5c60 (patch)
treee89b186f367df605e87a67c5a771ed7ec8502605 /Source
parent20e445f4418088ddf6e8f30ff3425af1588d2710 (diff)
parent4ce9742ae33678d8fce189d172c2fffb1a43061c (diff)
downloadCMake-ed484544cbf39ffefe1898b8255a5189062e5c60.zip
CMake-ed484544cbf39ffefe1898b8255a5189062e5c60.tar.gz
CMake-ed484544cbf39ffefe1898b8255a5189062e5c60.tar.bz2
Merge topic 'fix-alias-target-access'
4ce9742a Alias: Fix access at generate-time (#15832)
Diffstat (limited to 'Source')
-rw-r--r--Source/cmGlobalGenerator.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3d2db42..2126c71 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2274,6 +2274,12 @@ cmGlobalGenerator::FindTarget(const std::string& name,
cmGeneratorTarget*
cmGlobalGenerator::FindGeneratorTarget(const std::string& name) const
{
+ std::map<std::string, std::string>::const_iterator ai =
+ this->AliasTargets.find(name);
+ if (ai != this->AliasTargets.end())
+ {
+ return this->FindGeneratorTargetImpl(ai->second);
+ }
if (cmGeneratorTarget* tgt = this->FindGeneratorTargetImpl(name))
{
return tgt;