diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-23 13:44:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-23 13:44:34 (GMT) |
| commit | 91d21518ae652089dd94a3c9d09e5e800ab0dd6b (patch) | |
| tree | 44f8a4590700384ce9e1ce71fd5de069cdfb4324 /Source/cmGlobalNinjaGenerator.h | |
| parent | ea3e544098232edcaddf11c5fee5819256c92936 (diff) | |
| parent | f5c0efdbe4d67a6f262dd670923674b003af1726 (diff) | |
| download | CMake-91d21518ae652089dd94a3c9d09e5e800ab0dd6b.zip CMake-91d21518ae652089dd94a3c9d09e5e800ab0dd6b.tar.gz CMake-91d21518ae652089dd94a3c9d09e5e800ab0dd6b.tar.bz2 | |
Merge topic 'refactor-generator-startup'
f5c0efdb cmGlobalGenerator: Create a non-virtual 'DoGenerate' method
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index ff110d7..4cbbeea 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -182,9 +182,6 @@ public: /// Overloaded methods. @see cmGlobalGenerator::GetDocumentation() static void GetDocumentation(cmDocumentationEntry& entry); - /// Overloaded methods. @see cmGlobalGenerator::Generate() - virtual void Generate(); - /// Overloaded methods. @see cmGlobalGenerator::EnableLanguage() virtual void EnableLanguage(std::vector<std::string>const& languages, cmMakefile* mf, @@ -302,6 +299,9 @@ public: virtual void ComputeTargetObjectDirectory(cmGeneratorTarget* gt) const; protected: + /// Overloaded methods. @see cmGlobalGenerator::Generate() + virtual void Generate(); + /// Overloaded methods. /// @see cmGlobalGenerator::CheckALLOW_DUPLICATE_CUSTOM_TARGETS() virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS() const { return true; } |