Commit bb88668a authored by Stephen Kelly's avatar Stephen Kelly Committed by Brad King
Browse files

cmNinjaGenerator: Require cmGeneratorTarget.

parent a3b210fd
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
cmNinjaNormalTargetGenerator:: cmNinjaNormalTargetGenerator::
cmNinjaNormalTargetGenerator(cmGeneratorTarget* target) cmNinjaNormalTargetGenerator(cmGeneratorTarget* target)
: cmNinjaTargetGenerator(target->Target) : cmNinjaTargetGenerator(target)
, TargetNameOut() , TargetNameOut()
, TargetNameSO() , TargetNameSO()
, TargetNameReal() , TargetNameReal()
......
...@@ -57,19 +57,18 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target) ...@@ -57,19 +57,18 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target)
} }
} }
cmNinjaTargetGenerator::cmNinjaTargetGenerator(cmTarget* target) cmNinjaTargetGenerator::cmNinjaTargetGenerator(cmGeneratorTarget* target)
: :
MacOSXContentGenerator(0), MacOSXContentGenerator(0),
OSXBundleGenerator(0), OSXBundleGenerator(0),
MacContentFolders(), MacContentFolders(),
Target(target), Target(target->Target),
Makefile(target->GetMakefile()), Makefile(target->Makefile),
LocalGenerator( LocalGenerator(
static_cast<cmLocalNinjaGenerator*>(Makefile->GetLocalGenerator())), static_cast<cmLocalNinjaGenerator*>(target->GetLocalGenerator())),
Objects() Objects()
{ {
this->GeneratorTarget = this->GeneratorTarget = target;
this->GetGlobalGenerator()->GetGeneratorTarget(target);
MacOSXContentGenerator = new MacOSXContentGeneratorType(this); MacOSXContentGenerator = new MacOSXContentGeneratorType(this);
} }
......
...@@ -33,7 +33,7 @@ public: ...@@ -33,7 +33,7 @@ public:
static cmNinjaTargetGenerator* New(cmGeneratorTarget* target); static cmNinjaTargetGenerator* New(cmGeneratorTarget* target);
/// Build a NinjaTargetGenerator. /// Build a NinjaTargetGenerator.
cmNinjaTargetGenerator(cmTarget* target); cmNinjaTargetGenerator(cmGeneratorTarget* target);
/// Destructor. /// Destructor.
virtual ~cmNinjaTargetGenerator(); virtual ~cmNinjaTargetGenerator();
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator( cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(
cmGeneratorTarget *target) cmGeneratorTarget *target)
: cmNinjaTargetGenerator(target->Target) {} : cmNinjaTargetGenerator(target) {}
cmNinjaUtilityTargetGenerator::~cmNinjaUtilityTargetGenerator() {} cmNinjaUtilityTargetGenerator::~cmNinjaUtilityTargetGenerator() {}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment