diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-06-06 12:02:24 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-06-22 17:23:45 (GMT) |
| commit | bb88668addb3746f6f043533f0405914834a0421 (patch) | |
| tree | 041ed234df485a402548d9d2a7e4615963af6a80 /Source | |
| parent | a3b210fd6cb85cba76f867e93d94dd835fa3278a (diff) | |
| download | CMake-bb88668addb3746f6f043533f0405914834a0421.zip CMake-bb88668addb3746f6f043533f0405914834a0421.tar.gz CMake-bb88668addb3746f6f043533f0405914834a0421.tar.bz2 | |
cmNinjaGenerator: Require cmGeneratorTarget.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmNinjaNormalTargetGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 11 | ||||
| -rw-r--r-- | Source/cmNinjaTargetGenerator.h | 2 | ||||
| -rw-r--r-- | Source/cmNinjaUtilityTargetGenerator.cxx | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index bbf03ff..2fe53bf 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -32,7 +32,7 @@ cmNinjaNormalTargetGenerator:: cmNinjaNormalTargetGenerator(cmGeneratorTarget* target) - : cmNinjaTargetGenerator(target->Target) + : cmNinjaTargetGenerator(target) , TargetNameOut() , TargetNameSO() , TargetNameReal() diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 6e35cd4..b18f368 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -57,19 +57,18 @@ cmNinjaTargetGenerator::New(cmGeneratorTarget* target) } } -cmNinjaTargetGenerator::cmNinjaTargetGenerator(cmTarget* target) +cmNinjaTargetGenerator::cmNinjaTargetGenerator(cmGeneratorTarget* target) : MacOSXContentGenerator(0), OSXBundleGenerator(0), MacContentFolders(), - Target(target), - Makefile(target->GetMakefile()), + Target(target->Target), + Makefile(target->Makefile), LocalGenerator( - static_cast<cmLocalNinjaGenerator*>(Makefile->GetLocalGenerator())), + static_cast<cmLocalNinjaGenerator*>(target->GetLocalGenerator())), Objects() { - this->GeneratorTarget = - this->GetGlobalGenerator()->GetGeneratorTarget(target); + this->GeneratorTarget = target; MacOSXContentGenerator = new MacOSXContentGeneratorType(this); } diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h index 4e7d8b3..fc361b2 100644 --- a/Source/cmNinjaTargetGenerator.h +++ b/Source/cmNinjaTargetGenerator.h @@ -33,7 +33,7 @@ public: static cmNinjaTargetGenerator* New(cmGeneratorTarget* target); /// Build a NinjaTargetGenerator. - cmNinjaTargetGenerator(cmTarget* target); + cmNinjaTargetGenerator(cmGeneratorTarget* target); /// Destructor. virtual ~cmNinjaTargetGenerator(); diff --git a/Source/cmNinjaUtilityTargetGenerator.cxx b/Source/cmNinjaUtilityTargetGenerator.cxx index 42d6b46..c3bf011 100644 --- a/Source/cmNinjaUtilityTargetGenerator.cxx +++ b/Source/cmNinjaUtilityTargetGenerator.cxx @@ -21,7 +21,7 @@ cmNinjaUtilityTargetGenerator::cmNinjaUtilityTargetGenerator( cmGeneratorTarget *target) - : cmNinjaTargetGenerator(target->Target) {} + : cmNinjaTargetGenerator(target) {} cmNinjaUtilityTargetGenerator::~cmNinjaUtilityTargetGenerator() {} |