summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-04-05 13:37:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-04-05 13:37:59 (GMT)
commitadea45e15abf95b53e13ea8564cad9fc8e35ed56 (patch)
treeb8a655cd4d53b8cb5a691b6f88c3f825f617d157 /Source/cmLocalGenerator.cxx
parent6c60f116cb2bfe6753f526ceacfb5e54bc22efc5 (diff)
parent0e44f4894f23d5eccd8d360f3420c832f9433a20 (diff)
downloadCMake-adea45e15abf95b53e13ea8564cad9fc8e35ed56.zip
CMake-adea45e15abf95b53e13ea8564cad9fc8e35ed56.tar.gz
CMake-adea45e15abf95b53e13ea8564cad9fc8e35ed56.tar.bz2
Merge topic 'fix-target-alias-in-subdir'
0e44f489 Rename local target lookup methods to clarify purpose bc30f8b5 Fix lookup of an ALIAS target outside aliased target's directory (#16044)
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx15
1 files changed, 2 insertions, 13 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 1be39a9..0195b9e 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -485,19 +485,9 @@ private:
std::string Name;
};
-cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
+cmGeneratorTarget* cmLocalGenerator::FindLocalNonAliasGeneratorTarget(
const std::string& name) const
{
- std::map<std::string, std::string>::const_iterator i =
- this->AliasTargets.find(name);
- if (i != this->AliasTargets.end())
- {
- std::vector<cmGeneratorTarget*>::const_iterator ai =
- std::find_if(this->GeneratorTargets.begin(),
- this->GeneratorTargets.end(),
- NamedGeneratorTargetFinder(i->second));
- return *ai;
- }
std::vector<cmGeneratorTarget*>::const_iterator ti =
std::find_if(this->GeneratorTargets.begin(),
this->GeneratorTargets.end(),
@@ -506,7 +496,6 @@ cmGeneratorTarget* cmLocalGenerator::FindGeneratorTarget(
{
return *ti;
}
-
return 0;
}
@@ -1839,7 +1828,7 @@ cmLocalGenerator::FindGeneratorTargetToUse(const std::string& name) const
return *imported;
}
- if(cmGeneratorTarget* t = this->FindGeneratorTarget(name))
+ if(cmGeneratorTarget* t = this->FindLocalNonAliasGeneratorTarget(name))
{
return t;
}