diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-18 10:17:39 (GMT) |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2012-07-18 10:17:39 (GMT) |
| commit | 44ba4cfdb6471506db37634b032cf4fa3784f4f9 (patch) | |
| tree | c9230caf53978d4623932957c5d198645718e4ed /Source/cmNinjaTargetGenerator.cxx | |
| parent | 7751966297e3b68b6c9904300f96bb57882af11a (diff) | |
| download | CMake-44ba4cfdb6471506db37634b032cf4fa3784f4f9.zip CMake-44ba4cfdb6471506db37634b032cf4fa3784f4f9.tar.gz CMake-44ba4cfdb6471506db37634b032cf4fa3784f4f9.tar.bz2 | |
Ninja: remove warnings
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index ac2b468..967507e 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -57,7 +57,7 @@ cmNinjaTargetGenerator::New(cmTarget* target) cmNinjaTargetGenerator::cmNinjaTargetGenerator(cmTarget* target) : - MacOSXContentGenerator(this), + MacOSXContentGenerator(0), OSXBundleGenerator(0), MacContentFolders(), Target(target), @@ -68,10 +68,12 @@ cmNinjaTargetGenerator::cmNinjaTargetGenerator(cmTarget* target) { this->GeneratorTarget = this->GetGlobalGenerator()->GetGeneratorTarget(target); + MacOSXContentGenerator = new MacOSXContentGeneratorType(this); } cmNinjaTargetGenerator::~cmNinjaTargetGenerator() { + delete MacOSXContentGenerator; } cmGeneratedFileStream& cmNinjaTargetGenerator::GetBuildFileStream() const @@ -434,10 +436,10 @@ cmNinjaTargetGenerator } this->OSXBundleGenerator->GenerateMacOSXContentStatements( this->GeneratorTarget->HeaderSources, - &this->MacOSXContentGenerator); + this->MacOSXContentGenerator); this->OSXBundleGenerator->GenerateMacOSXContentStatements( this->GeneratorTarget->ExtraSources, - &this->MacOSXContentGenerator); + this->MacOSXContentGenerator); for(std::vector<cmSourceFile*>::const_iterator si = this->GeneratorTarget->ExternalObjects.begin(); si != this->GeneratorTarget->ExternalObjects.end(); ++si) @@ -645,13 +647,6 @@ cmNinjaTargetGenerator EnsureDirectoryExists(cmSystemTools::GetParentDirectory(path.c_str())); } -//---------------------------------------------------------------------------- -cmNinjaTargetGenerator::MacOSXContentGeneratorType:: -MacOSXContentGeneratorType(cmNinjaTargetGenerator* generator) - : cmOSXBundleGenerator::MacOSXContentGeneratorType() - , Generator(generator) -{ -} //---------------------------------------------------------------------------- void |