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/cmGlobalGenerator.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/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index ee3f269..6b608bb 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -80,7 +80,7 @@ public: * basically creates a series of LocalGenerators for each directory and * requests that they Generate. */ - virtual void Generate(); + void DoGenerate(); /** * Set/Get and Clear the enabled languages. @@ -338,6 +338,8 @@ public: bool GenerateCPackPropertiesFile(); protected: + virtual void Generate(); + typedef std::vector<cmLocalGenerator*> GeneratorVector; // for a project collect all its targets by following depend // information, and also collect all the targets |