summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefileTargetGenerator.cxx
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-07-18 10:17:39 (GMT)
committerPeter Kümmel <syntheticpp@gmx.net>2012-07-18 10:17:39 (GMT)
commit44ba4cfdb6471506db37634b032cf4fa3784f4f9 (patch)
treec9230caf53978d4623932957c5d198645718e4ed /Source/cmMakefileTargetGenerator.cxx
parent7751966297e3b68b6c9904300f96bb57882af11a (diff)
downloadCMake-44ba4cfdb6471506db37634b032cf4fa3784f4f9.zip
CMake-44ba4cfdb6471506db37634b032cf4fa3784f4f9.tar.gz
CMake-44ba4cfdb6471506db37634b032cf4fa3784f4f9.tar.bz2
Ninja: remove warnings
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r--Source/cmMakefileTargetGenerator.cxx19
1 files changed, 9 insertions, 10 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx
index bc016dc..0de182e 100644
--- a/Source/cmMakefileTargetGenerator.cxx
+++ b/Source/cmMakefileTargetGenerator.cxx
@@ -29,7 +29,7 @@
cmMakefileTargetGenerator::cmMakefileTargetGenerator(cmTarget* target)
: OSXBundleGenerator(0)
- , MacOSXContentGenerator(this)
+ , MacOSXContentGenerator(0)
{
this->BuildFileStream = 0;
this->InfoFileStream = 0;
@@ -52,6 +52,12 @@ cmMakefileTargetGenerator::cmMakefileTargetGenerator(cmTarget* target)
{
this->NoRuleMessages = cmSystemTools::IsOff(ruleStatus);
}
+ MacOSXContentGenerator = new MacOSXContentGeneratorType(this);
+}
+
+cmMakefileTargetGenerator::~cmMakefileTargetGenerator()
+{
+ delete MacOSXContentGenerator;
}
cmMakefileTargetGenerator *
@@ -157,10 +163,10 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
}
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)
@@ -348,13 +354,6 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
}
}
-//----------------------------------------------------------------------------
-cmMakefileTargetGenerator::MacOSXContentGeneratorType::
-MacOSXContentGeneratorType(cmMakefileTargetGenerator* generator)
- : cmOSXBundleGenerator::MacOSXContentGeneratorType()
- , Generator(generator)
-{
-}
//----------------------------------------------------------------------------
void