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

cmNinjaGenerator: Require cmGeneratorTarget.

This commit is contained in:
Stephen Kelly 2015-06-06 14:02:24 +02:00 committed by Brad King
parent a3b210fd6c
commit bb88668add
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -32,7 +32,7 @@
cmNinjaNormalTargetGenerator:: cmNinjaNormalTargetGenerator::
cmNinjaNormalTargetGenerator(cmGeneratorTarget* target) cmNinjaNormalTargetGenerator(cmGeneratorTarget* target)
: cmNinjaTargetGenerator(target->Target) : cmNinjaTargetGenerator(target)
, TargetNameOut() , TargetNameOut()
, TargetNameSO() , TargetNameSO()
, TargetNameReal() , TargetNameReal()

11
Source/cmNinjaTargetGenerator.cxx
View File

@ -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);
} }

2
Source/cmNinjaTargetGenerator.h
View File

@ -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();

2
Source/cmNinjaUtilityTargetGenerator.cxx
View File

@ -21,7 +21,7 @@
cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator( cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator(
cmGeneratorTarget *target) cmGeneratorTarget *target)
: cmNinjaTargetGenerator(target->Target) {} : cmNinjaTargetGenerator(target) {}
cmNinjaUtilityTargetGenerator::~cmNinjaUtilityTargetGenerator() {} cmNinjaUtilityTargetGenerator::~cmNinjaUtilityTargetGenerator() {}