exports: Rename cmGlobalGenerator::AddTargetToExport{s,}
This function adds target to one export, not to several exports.
This commit is contained in:
parent
e846e7031f
commit
4e2347cbf3
|
@ -1466,7 +1466,7 @@ void cmGlobalGenerator::AddInstallComponent(const char* component)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmGlobalGenerator::AddTargetToExports(const char* exportSetName,
|
void cmGlobalGenerator::AddTargetToExport(const char* exportSetName,
|
||||||
cmTargetExport *te)
|
cmTargetExport *te)
|
||||||
{
|
{
|
||||||
if ((exportSetName) && (*exportSetName) && (te))
|
if ((exportSetName) && (*exportSetName) && (te))
|
||||||
|
|
|
@ -154,7 +154,7 @@ public:
|
||||||
{ return &this->InstallComponents; }
|
{ return &this->InstallComponents; }
|
||||||
|
|
||||||
///! Add one installed target to the sets of the exports
|
///! Add one installed target to the sets of the exports
|
||||||
void AddTargetToExports(const char* exportSet, cmTargetExport* te);
|
void AddTargetToExport(const char* exportSet, cmTargetExport* te);
|
||||||
///! Get the export target set with the given name
|
///! Get the export target set with the given name
|
||||||
const std::vector<cmTargetExport*>* GetExportSet(const char* name) const;
|
const std::vector<cmTargetExport*>* GetExportSet(const char* name) const;
|
||||||
|
|
||||||
|
|
|
@ -745,24 +745,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
|
||||||
te->LibraryGenerator = libraryGenerator;
|
te->LibraryGenerator = libraryGenerator;
|
||||||
te->RuntimeGenerator = runtimeGenerator;
|
te->RuntimeGenerator = runtimeGenerator;
|
||||||
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
|
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
|
||||||
->AddTargetToExports(exports.GetCString(), te);
|
->AddTargetToExport(exports.GetCString(), te);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Add this install rule to an export if one was specified and
|
|
||||||
// this is not a namelink-only rule.
|
|
||||||
if(!exports.GetString().empty() && !namelinkOnly)
|
|
||||||
{
|
|
||||||
this->Makefile->GetLocalGenerator()->GetGlobalGenerator()
|
|
||||||
->AddTargetToExports(exports.GetCString(), &target,
|
|
||||||
archiveGenerator, runtimeGenerator,
|
|
||||||
libraryGenerator, frameworkGenerator,
|
|
||||||
bundleGenerator, publicHeaderGenerator);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Tell the global generator about any installation component names
|
// Tell the global generator about any installation component names
|
||||||
// specified
|
// specified
|
||||||
if (installsArchive)
|
if (installsArchive)
|
||||||
|
|
Loading…
Reference in New Issue