From 4e2347cbf39ab72f9bf4ca8bdac7dbecd0143dde Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 27 Feb 2012 02:15:51 +0400 Subject: exports: Rename cmGlobalGenerator::AddTargetToExport{s,} This function adds target to one export, not to several exports. --- Source/cmGlobalGenerator.cxx | 2 +- Source/cmGlobalGenerator.h | 2 +- Source/cmInstallCommand.cxx | 16 +--------------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 77274dc..15edfec 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1466,7 +1466,7 @@ void cmGlobalGenerator::AddInstallComponent(const char* component) } } -void cmGlobalGenerator::AddTargetToExports(const char* exportSetName, +void cmGlobalGenerator::AddTargetToExport(const char* exportSetName, cmTargetExport *te) { if ((exportSetName) && (*exportSetName) && (te)) diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 29f11e1..5408c7e 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -154,7 +154,7 @@ public: { return &this->InstallComponents; } ///! 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 const std::vector* GetExportSet(const char* name) const; diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx index de92538..62fc2ef 100644 --- a/Source/cmInstallCommand.cxx +++ b/Source/cmInstallCommand.cxx @@ -745,24 +745,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector const& args) te->LibraryGenerator = libraryGenerator; te->RuntimeGenerator = runtimeGenerator; 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 // specified if (installsArchive) -- cgit v0.12