echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmExportFileGenerator: Use cmGeneratorTarget::ResolveTargetReference

Browse Source 
Avoid calling `FindGeneratorTargetToUse` directly.
This commit is contained in:
Brad King 2018-09-10 09:42:19 -04:00
parent 18441a6269
commit f9cb6f618a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmExportFileGenerator.cxx
View File

@ -567,14 +567,17 @@ bool cmExportFileGenerator::AddTargetNamespace(
std::string& input, cmGeneratorTarget* target,
std::vector<std::string>& missingTargets)
{
cmLocalGenerator* lg = target->GetLocalGenerator();
cmGeneratorTarget::TargetOrString resolved =
target->ResolveTargetReference(input);
cmGeneratorTarget* tgt = lg->FindGeneratorTargetToUse(input);
cmGeneratorTarget* tgt = resolved.Target;
if (!tgt) {
input = resolved.String;
return false;
}
if (tgt->IsImported()) {
input = tgt->GetName();
return true;
}
if (this->ExportedTargets.find(tgt) != this->ExportedTargets.end()) {
@ -584,6 +587,8 @@ bool cmExportFileGenerator::AddTargetNamespace(
this->HandleMissingTarget(namespacedTarget, missingTargets, target, tgt);
if (!namespacedTarget.empty()) {
input = namespacedTarget;
} else {
input = tgt->GetName();
}
}
return true;