kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

exports: fix build with MSVC6

Browse Source 
it seems it doesn't like deleting const pointers

Alex
This commit is contained in:
Alex Neundorf 2012-09-25 19:19:27 +02:00 committed by Brad King
parent 8b5f448ba6
commit 190f2c8253
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmExportFileGenerator.cxx
View File

@ -286,7 +286,7 @@ std::vector<std::string> cmExportFileGenerator::FindNamespaces(cmMakefile* mf,
++expIt) ++expIt)
{ {
const cmExportSet* exportSet = expIt->second; const cmExportSet* exportSet = expIt->second;
std::vector<cmTargetExport const*> const* targets = std::vector<cmTargetExport*> const* targets =
exportSet->GetTargetExports(); exportSet->GetTargetExports();
bool containsTarget = false; bool containsTarget = false;

4
Source/cmExportInstallFileGenerator.cxx
View File

@ -37,7 +37,7 @@ std::string cmExportInstallFileGenerator::GetConfigImportFileGlob()
bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os) bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
{ {
// Create all the imported targets. // Create all the imported targets.
for(std::vector<cmTargetExport const*>::const_iterator for(std::vector<cmTargetExport*>::const_iterator
tei = this->IEGen->GetExportSet()->GetTargetExports()->begin(); tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei) tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
{ {
@ -163,7 +163,7 @@ cmExportInstallFileGenerator
} }
// Add each target in the set to the export. // Add each target in the set to the export.
for(std::vector<cmTargetExport const*>::const_iterator for(std::vector<cmTargetExport*>::const_iterator
tei = this->IEGen->GetExportSet()->GetTargetExports()->begin(); tei = this->IEGen->GetExportSet()->GetTargetExports()->begin();
tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei) tei != this->IEGen->GetExportSet()->GetTargetExports()->end(); ++tei)
{ {

2
Source/cmExportSet.cxx
View File

@ -21,7 +21,7 @@ cmExportSet::~cmExportSet()
} }
} }
void cmExportSet::AddTargetExport(cmTargetExport const* te) void cmExportSet::AddTargetExport(cmTargetExport* te)
{ {
this->TargetExports.push_back(te); this->TargetExports.push_back(te);
} }

6
Source/cmExportSet.h
View File

@ -25,20 +25,20 @@ public:
/// Destructor /// Destructor
~cmExportSet(); ~cmExportSet();
void AddTargetExport(cmTargetExport const* tgt); void AddTargetExport(cmTargetExport* tgt);
void AddInstallation(cmInstallExportGenerator const* installation); void AddInstallation(cmInstallExportGenerator const* installation);
std::string const& GetName() const { return this->Name; } std::string const& GetName() const { return this->Name; }
std::vector<cmTargetExport const*> const* GetTargetExports() const std::vector<cmTargetExport*> const* GetTargetExports() const
{ return &this->TargetExports; } { return &this->TargetExports; }
std::vector<cmInstallExportGenerator const*> const* GetInstallations() const std::vector<cmInstallExportGenerator const*> const* GetInstallations() const
{ return &this->Installations; } { return &this->Installations; }
private: private:
std::vector<cmTargetExport const*> TargetExports; std::vector<cmTargetExport*> TargetExports;
std::string Name; std::string Name;
std::vector<cmInstallExportGenerator const*> Installations; std::vector<cmInstallExportGenerator const*> Installations;
}; };