diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-01 10:52:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-09-28 13:21:39 (GMT) |
| commit | 81cdab5beaffc7665550710b84006a0a7ce76cfa (patch) | |
| tree | b0a6474986aa464700ef4d3e61ffb09572981d0f /Source/cmInstallExportGenerator.cxx | |
| parent | 5c898fbd99f6d12e8835a0dd3b229d93812e7533 (diff) | |
| download | CMake-81cdab5beaffc7665550710b84006a0a7ce76cfa.zip CMake-81cdab5beaffc7665550710b84006a0a7ce76cfa.tar.gz CMake-81cdab5beaffc7665550710b84006a0a7ce76cfa.tar.bz2 | |
exports: Hold an ExportSet pointer in cm*Export*Generator
Get name from this->ExportSet.
Diffstat (limited to 'Source/cmInstallExportGenerator.cxx')
| -rw-r--r-- | Source/cmInstallExportGenerator.cxx | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Source/cmInstallExportGenerator.cxx b/Source/cmInstallExportGenerator.cxx index 0179cd1..caedaf5 100644 --- a/Source/cmInstallExportGenerator.cxx +++ b/Source/cmInstallExportGenerator.cxx @@ -27,7 +27,7 @@ //---------------------------------------------------------------------------- cmInstallExportGenerator::cmInstallExportGenerator( - const char* name, + cmExportSet* exportSet, const char* destination, const char* file_permissions, std::vector<std::string> const& configurations, @@ -35,7 +35,7 @@ cmInstallExportGenerator::cmInstallExportGenerator( const char* filename, const char* name_space, cmMakefile* mf) :cmInstallGenerator(destination, configurations, component) - ,Name(name) + ,ExportSet(exportSet) ,FilePermissions(file_permissions) ,FileName(filename) ,Namespace(name_space) @@ -114,16 +114,12 @@ void cmInstallExportGenerator::ComputeTempDir() //---------------------------------------------------------------------------- void cmInstallExportGenerator::GenerateScript(std::ostream& os) { - // Get the export set requested. - cmExportSet const* exportSet = - this->Makefile->GetLocalGenerator()->GetGlobalGenerator() - ->GetExportSets()[this->Name]; - // Skip empty sets. - if(!exportSet) + if(ExportSet->GetTargetExports()->empty()) { cmOStringStream e; - e << "INSTALL(EXPORT) given unknown export \"" << this->Name << "\""; + e << "INSTALL(EXPORT) given unknown export \"" + << ExportSet->GetName() << "\""; cmSystemTools::Error(e.str().c_str()); return; } @@ -138,8 +134,6 @@ void cmInstallExportGenerator::GenerateScript(std::ostream& os) this->MainImportFile += this->FileName; // Generate the import file for this export set. - this->EFGen->SetName(this->Name.c_str()); - this->EFGen->SetExportSet(exportSet); this->EFGen->SetExportFile(this->MainImportFile.c_str()); this->EFGen->SetNamespace(this->Namespace.c_str()); if(this->ConfigurationTypes->empty()) |