cmLocalGenerator: Remove Parent pointer.

2015-08-02 11:08:49 +02:00 · 2015-08-02 11:08:49 +02:00 · 9b6a743b80
parent 11d5088a2f
commit 9b6a743b80
39 changed files with 49 additions and 88 deletions
--- a/Source/cmGlobalBorlandMakefileGenerator.cxx
+++ b/Source/cmGlobalBorlandMakefileGenerator.cxx
@ -44,10 +44,10 @@ void cmGlobalBorlandMakefileGenerator

 ///! Create a local generator appropriate to this Global Generator
 cmLocalGenerator *cmGlobalBorlandMakefileGenerator::CreateLocalGenerator(
-    cmLocalGenerator* parent, cmState::Snapshot snapshot)
+    cmState::Snapshot snapshot)
 {
  cmLocalUnixMakefileGenerator3* lg =
-      new cmLocalUnixMakefileGenerator3(this, parent, snapshot);
+      new cmLocalUnixMakefileGenerator3(this, snapshot);
  lg->SetMakefileVariableSize(32);
  lg->SetMakeCommandEscapeTargetTwice(true);
  lg->SetBorlandMakeCurlyHack(true);
--- a/Source/cmGlobalBorlandMakefileGenerator.h
+++ b/Source/cmGlobalBorlandMakefileGenerator.h
@ -36,8 +36,7 @@ public:
  static void GetDocumentation(cmDocumentationEntry& entry);

  ///! Create a local generator appropriate to this Global Generator
-  virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent,
-                                                 cmState::Snapshot snapshot);
+  virtual cmLocalGenerator *CreateLocalGenerator(cmState::Snapshot snapshot);

  /**
   * Try to determine system information such as shared library
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@ -1986,22 +1986,20 @@ void cmGlobalGenerator::EnableInstallTarget()
 }

 cmLocalGenerator *
-cmGlobalGenerator::MakeLocalGenerator(cmState::Snapshot snapshot,
-                                      cmLocalGenerator *parent)
+cmGlobalGenerator::MakeLocalGenerator(cmState::Snapshot snapshot)
 {
  if (!snapshot.IsValid())
    {
    snapshot = this->CMakeInstance->GetCurrentSnapshot();
    }

-  return this->CreateLocalGenerator(parent, snapshot);
+  return this->CreateLocalGenerator(snapshot);
 }

 cmLocalGenerator*
-cmGlobalGenerator::CreateLocalGenerator(cmLocalGenerator* parent,
-                                        cmState::Snapshot snapshot)
+cmGlobalGenerator::CreateLocalGenerator(cmState::Snapshot snapshot)
 {
-  return new cmLocalGenerator(this, parent, snapshot);
+  return new cmLocalGenerator(this, snapshot);
 }

 void cmGlobalGenerator::EnableLanguagesFromGenerator(cmGlobalGenerator *gen,
--- a/Source/cmGlobalGenerator.h
+++ b/Source/cmGlobalGenerator.h
@ -56,9 +56,8 @@ public:
  cmGlobalGenerator(cmake* cm);
  virtual ~cmGlobalGenerator();

-  cmLocalGenerator* MakeLocalGenerator(
-      cmState::Snapshot snapshot = cmState::Snapshot(),
-      cmLocalGenerator* parent = 0);
+  cmLocalGenerator*
+  MakeLocalGenerator(cmState::Snapshot snapshot = cmState::Snapshot());

  ///! Get the name for this generator
  virtual std::string GetName() const { return "Generic"; }
@ -442,8 +441,7 @@ protected:

 private:
  ///! Create a local generator appropriate to this Global Generator
-  virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent,
-                                                 cmState::Snapshot snapshot);
+  virtual cmLocalGenerator *CreateLocalGenerator(cmState::Snapshot snapshot);

  cmMakefile* TryCompileOuterMakefile;
  // If you add a new map here, make sure it is copied
--- a/Source/cmGlobalGhsMultiGenerator.cxx
+++ b/Source/cmGlobalGhsMultiGenerator.cxx
@ -33,10 +33,9 @@ cmGlobalGhsMultiGenerator::~cmGlobalGhsMultiGenerator()
 }

 cmLocalGenerator *
-cmGlobalGhsMultiGenerator::CreateLocalGenerator(cmLocalGenerator* parent,
-                                                cmState::Snapshot snapshot)
+cmGlobalGhsMultiGenerator::CreateLocalGenerator(cmState::Snapshot snapshot)
 {
-  return new cmLocalGhsMultiGenerator(this, parent, snapshot);
+  return new cmLocalGhsMultiGenerator(this, snapshot);
 }

 void cmGlobalGhsMultiGenerator::GetDocumentation(cmDocumentationEntry &entry)
--- a/Source/cmGlobalGhsMultiGenerator.h
+++ b/Source/cmGlobalGhsMultiGenerator.h
@ -31,8 +31,7 @@ public:
  { return new cmGlobalGeneratorSimpleFactory<cmGlobalGhsMultiGenerator>(); }

  ///! create the correct local generator
-  virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent,
-                                                 cmState::Snapshot snapshot);
+  virtual cmLocalGenerator *CreateLocalGenerator(cmState::Snapshot snapshot);

  /// @return the name of this generator.
  static std::string GetActualName() { return "Green Hills MULTI"; }
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@ -528,10 +528,9 @@ cmGlobalNinjaGenerator::cmGlobalNinjaGenerator(cmake* cm)
 // Virtual public methods.

 cmLocalGenerator*
-cmGlobalNinjaGenerator::CreateLocalGenerator(cmLocalGenerator* parent,
-                                             cmState::Snapshot snapshot)
+cmGlobalNinjaGenerator::CreateLocalGenerator(cmState::Snapshot snapshot)
 {
-  return new cmLocalNinjaGenerator(this, parent, snapshot);
+  return new cmLocalNinjaGenerator(this, snapshot);
 }

 void cmGlobalNinjaGenerator
--- a/Source/cmGlobalNinjaGenerator.h
+++ b/Source/cmGlobalNinjaGenerator.h
@ -170,8 +170,7 @@ public:
  virtual ~cmGlobalNinjaGenerator() { }

  /// Overloaded methods. @see cmGlobalGenerator::CreateLocalGenerator()
-  virtual cmLocalGenerator* CreateLocalGenerator(cmLocalGenerator* parent,
-                                                 cmState::Snapshot snapshot);
+  virtual cmLocalGenerator* CreateLocalGenerator(cmState::Snapshot snapshot);

  /// Overloaded methods. @see cmGlobalGenerator::GetName().
  virtual std::string GetName() const {
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@ -59,11 +59,10 @@ void cmGlobalUnixMakefileGenerator3
 }

 ///! Create a local generator appropriate to this Global Generator
-cmLocalGenerator *
-cmGlobalUnixMakefileGenerator3::CreateLocalGenerator(cmLocalGenerator* parent,
+cmLocalGenerator* cmGlobalUnixMakefileGenerator3::CreateLocalGenerator(
    cmState::Snapshot snapshot)
 {
-  return new cmLocalUnixMakefileGenerator3(this, parent, snapshot);
+  return new cmLocalUnixMakefileGenerator3(this, snapshot);
 }

 //----------------------------------------------------------------------------
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@ -68,8 +68,7 @@ public:
  static void GetDocumentation(cmDocumentationEntry& entry);

  ///! Create a local generator appropriate to this Global Generator3
-  virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent,
-                                                 cmState::Snapshot snapshot);
+  virtual cmLocalGenerator *CreateLocalGenerator(cmState::Snapshot snapshot);

  /**
   * Try to determine system information such as shared library
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@ -306,11 +306,10 @@ void cmGlobalVisualStudio10Generator::WriteSLNHeader(std::ostream& fout)
 }

 ///! Create a local generator appropriate to this Global Generator
-cmLocalGenerator *
-cmGlobalVisualStudio10Generator::CreateLocalGenerator(cmLocalGenerator* parent,
+cmLocalGenerator* cmGlobalVisualStudio10Generator::CreateLocalGenerator(
    cmState::Snapshot snapshot)
 {
-  return new cmLocalVisualStudio10Generator(this, parent, snapshot);
+  return new cmLocalVisualStudio10Generator(this, snapshot);
 }

 //----------------------------------------------------------------------------
--- a/Source/cmGlobalVisualStudio10Generator.h
+++ b/Source/cmGlobalVisualStudio10Generator.h
@ -48,8 +48,7 @@ public:
  virtual bool Compute();

  ///! create the correct local generator
-  virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent,
-                                                 cmState::Snapshot snapshot);
+  virtual cmLocalGenerator *CreateLocalGenerator(cmState::Snapshot snapshot);

  /**
   * Try to determine system information such as shared library
--- a/Source/cmGlobalVisualStudio6Generator.cxx
+++ b/Source/cmGlobalVisualStudio6Generator.cxx
@ -173,10 +173,10 @@ cmGlobalVisualStudio6Generator::GenerateBuildCommand(

 ///! Create a local generator appropriate to this Global Generator
 cmLocalGenerator *
-cmGlobalVisualStudio6Generator::CreateLocalGenerator(cmLocalGenerator* parent,
+cmGlobalVisualStudio6Generator::CreateLocalGenerator(
                                                   cmState::Snapshot snapshot)
 {
-  return new cmLocalVisualStudio6Generator(this, parent, snapshot);
+  return new cmLocalVisualStudio6Generator(this, snapshot);
 }


--- a/Source/cmGlobalVisualStudio6Generator.h
+++ b/Source/cmGlobalVisualStudio6Generator.h
@ -39,8 +39,7 @@ public:
  static void GetDocumentation(cmDocumentationEntry& entry);

  ///! Create a local generator appropriate to this Global Generator
-  virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent,
-                                                 cmState::Snapshot snapshot);
+  virtual cmLocalGenerator *CreateLocalGenerator(cmState::Snapshot snapshot);

  /**
   * Try to determine system information such as shared library
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@ -279,12 +279,11 @@ void cmGlobalVisualStudio7Generator::GenerateBuildCommand(
 }

 ///! Create a local generator appropriate to this Global Generator
-cmLocalGenerator *
-cmGlobalVisualStudio7Generator::CreateLocalGenerator(cmLocalGenerator* parent,
+cmLocalGenerator *cmGlobalVisualStudio7Generator::CreateLocalGenerator(
    cmState::Snapshot snapshot)
 {
  cmLocalVisualStudio7Generator *lg =
-    new cmLocalVisualStudio7Generator(this, parent, snapshot);
+    new cmLocalVisualStudio7Generator(this, snapshot);
  return lg;
 }

--- a/Source/cmGlobalVisualStudio7Generator.h
+++ b/Source/cmGlobalVisualStudio7Generator.h
@ -43,8 +43,7 @@ public:
  std::string const& GetPlatformName() const;

  ///! Create a local generator appropriate to this Global Generator
-  virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent,
-                                                 cmState::Snapshot snapshot);
+  virtual cmLocalGenerator *CreateLocalGenerator(cmState::Snapshot snapshot);

  virtual bool SetSystemName(std::string const& s, cmMakefile* mf);

--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@ -371,10 +371,9 @@ cmGlobalXCodeGenerator::GenerateBuildCommand(
 //----------------------------------------------------------------------------
 ///! Create a local generator appropriate to this Global Generator
 cmLocalGenerator *
-cmGlobalXCodeGenerator::CreateLocalGenerator(cmLocalGenerator* parent,
-                                             cmState::Snapshot snapshot)
+cmGlobalXCodeGenerator::CreateLocalGenerator(cmState::Snapshot snapshot)
 {
-  return new cmLocalXCodeGenerator(this, parent, snapshot);
+  return new cmLocalXCodeGenerator(this, snapshot);
 }

 //----------------------------------------------------------------------------
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@ -41,8 +41,7 @@ public:
  static void GetDocumentation(cmDocumentationEntry& entry);

  ///! Create a local generator appropriate to this Global Generator
-  virtual cmLocalGenerator *CreateLocalGenerator(cmLocalGenerator* parent,
-                                                 cmState::Snapshot snapshot);
+  virtual cmLocalGenerator *CreateLocalGenerator(cmState::Snapshot snapshot);

  /**
   * Try to determine system information such as shared library
--- a/Source/cmLocalCommonGenerator.cxx
+++ b/Source/cmLocalCommonGenerator.cxx
@ -14,9 +14,8 @@
 #include "cmMakefile.h"

 cmLocalCommonGenerator::cmLocalCommonGenerator(cmGlobalGenerator* gg,
-                                               cmLocalGenerator* parent,
                                               cmState::Snapshot snapshot):
-  cmLocalGenerator(gg, parent, snapshot)
+  cmLocalGenerator(gg, snapshot)
 {
 }

--- a/Source/cmLocalCommonGenerator.h
+++ b/Source/cmLocalCommonGenerator.h
@ -23,7 +23,6 @@ class cmLocalCommonGenerator: public cmLocalGenerator
 {
 public:
  cmLocalCommonGenerator(cmGlobalGenerator* gg,
-                         cmLocalGenerator* parent,
                         cmState::Snapshot snapshot);
  ~cmLocalCommonGenerator();

--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@ -43,13 +43,11 @@
 #endif

 cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg,
-                                   cmLocalGenerator* parent,
                                   cmState::Snapshot snapshot)
  : cmOutputConverter(snapshot), StateSnapshot(snapshot)
 {
  assert(snapshot.IsValid());
  this->GlobalGenerator = gg;
-  this->Parent = parent;

  this->Makefile = new cmMakefile(this);

--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@ -36,8 +36,7 @@ class cmCustomCommandGenerator;
 class cmLocalGenerator : public cmOutputConverter
 {
 public:
-  cmLocalGenerator(cmGlobalGenerator* gg, cmLocalGenerator* parent,
-                   cmState::Snapshot snapshot);
+  cmLocalGenerator(cmGlobalGenerator* gg, cmState::Snapshot snapshot);
  virtual ~cmLocalGenerator();

  /**
@ -86,9 +85,6 @@ public:
  cmState* GetState() const;
  cmState::Snapshot GetStateSnapshot() const;

-  ///! set/get the parent generator
-  cmLocalGenerator* GetParent() const {return this->Parent;}
-
  void AddArchitectureFlags(std::string& flags,
                            cmGeneratorTarget const* target,
                            const std::string&lang, const std::string& config);
@ -343,7 +339,6 @@ protected:
  cmMakefile *Makefile;
  cmState::Snapshot StateSnapshot;
  cmGlobalGenerator *GlobalGenerator;
-  cmLocalGenerator* Parent;
  std::map<std::string, std::string> UniqueObjectNamesMap;
  std::string::size_type ObjectPathMax;
  std::set<std::string> ObjectMaxPathViolations;
--- a/Source/cmLocalGhsMultiGenerator.cxx
+++ b/Source/cmLocalGhsMultiGenerator.cxx
@ -17,9 +17,8 @@
 #include "cmGeneratedFileStream.h"

 cmLocalGhsMultiGenerator::cmLocalGhsMultiGenerator(cmGlobalGenerator* gg,
-                                                   cmLocalGenerator* parent,
                                                   cmState::Snapshot snapshot)
-  : cmLocalGenerator(gg, parent, snapshot)
+  : cmLocalGenerator(gg, snapshot)
 {
 }

--- a/Source/cmLocalGhsMultiGenerator.h
+++ b/Source/cmLocalGhsMultiGenerator.h
@ -25,7 +25,7 @@ class cmGeneratedFileStream;
 class cmLocalGhsMultiGenerator : public cmLocalGenerator
 {
 public:
-  cmLocalGhsMultiGenerator(cmGlobalGenerator* gg, cmLocalGenerator* parent,
+  cmLocalGhsMultiGenerator(cmGlobalGenerator* gg,
                           cmState::Snapshot snapshot);

  virtual ~cmLocalGhsMultiGenerator();
--- a/Source/cmLocalNinjaGenerator.cxx
+++ b/Source/cmLocalNinjaGenerator.cxx
@ -23,9 +23,8 @@
 #include <assert.h>

 cmLocalNinjaGenerator::cmLocalNinjaGenerator(cmGlobalGenerator* gg,
-                                             cmLocalGenerator* parent,
                                             cmState::Snapshot snapshot)
-  : cmLocalCommonGenerator(gg, parent, snapshot)
+  : cmLocalCommonGenerator(gg, snapshot)
  , HomeRelativeOutputPath("")
 {
  this->TargetImplib = "$TARGET_IMPLIB";
--- a/Source/cmLocalNinjaGenerator.h
+++ b/Source/cmLocalNinjaGenerator.h
@ -31,7 +31,7 @@ class cmake;
 class cmLocalNinjaGenerator : public cmLocalCommonGenerator
 {
 public:
-  cmLocalNinjaGenerator(cmGlobalGenerator* gg, cmLocalGenerator* parent,
+  cmLocalNinjaGenerator(cmGlobalGenerator* gg,
                        cmState::Snapshot snapshot);

  virtual ~cmLocalNinjaGenerator();
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@ -80,9 +80,9 @@ static std::string cmSplitExtension(std::string const& in, std::string& base)

 //----------------------------------------------------------------------------
 cmLocalUnixMakefileGenerator3::
-cmLocalUnixMakefileGenerator3(cmGlobalGenerator* gg, cmLocalGenerator* parent,
+cmLocalUnixMakefileGenerator3(cmGlobalGenerator* gg,
                              cmState::Snapshot snapshot)
-  : cmLocalCommonGenerator(gg, parent, snapshot)
+  : cmLocalCommonGenerator(gg, snapshot)
 {
  this->MakefileVariableSize = 0;
  this->ColorMakefile = false;
--- a/Source/cmLocalUnixMakefileGenerator3.h
+++ b/Source/cmLocalUnixMakefileGenerator3.h
@ -35,7 +35,6 @@ class cmLocalUnixMakefileGenerator3 : public cmLocalCommonGenerator
 {
 public:
  cmLocalUnixMakefileGenerator3(cmGlobalGenerator* gg,
-                                cmLocalGenerator* parent,
                                cmState::Snapshot snapshot);
  virtual ~cmLocalUnixMakefileGenerator3();

--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@ -63,9 +63,8 @@ class cmVS10XMLParser : public cmXMLParser
 //----------------------------------------------------------------------------
 cmLocalVisualStudio10Generator
 ::cmLocalVisualStudio10Generator(cmGlobalGenerator* gg,
-                                 cmLocalGenerator* parent,
                                 cmState::Snapshot snapshot):
-  cmLocalVisualStudio7Generator(gg, parent, snapshot)
+  cmLocalVisualStudio7Generator(gg, snapshot)
 {
 }

--- a/Source/cmLocalVisualStudio10Generator.h
+++ b/Source/cmLocalVisualStudio10Generator.h
@ -26,7 +26,6 @@ class cmLocalVisualStudio10Generator : public cmLocalVisualStudio7Generator
 public:
  ///! Set cache only and recurse to false by default.
  cmLocalVisualStudio10Generator(cmGlobalGenerator* gg,
-                                 cmLocalGenerator* parent,
                                 cmState::Snapshot snapshot);

  virtual ~cmLocalVisualStudio10Generator();
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@ -25,9 +25,8 @@

 cmLocalVisualStudio6Generator
 ::cmLocalVisualStudio6Generator(cmGlobalGenerator* gg,
-                                cmLocalGenerator* parent,
                                cmState::Snapshot snapshot):
-  cmLocalVisualStudioGenerator(gg, parent, snapshot)
+  cmLocalVisualStudioGenerator(gg, snapshot)
 {
 }

--- a/Source/cmLocalVisualStudio6Generator.h
+++ b/Source/cmLocalVisualStudio6Generator.h
@ -30,7 +30,6 @@ class cmLocalVisualStudio6Generator : public cmLocalVisualStudioGenerator
 public:
  ///! Set cache only and recurse to false by default.
  cmLocalVisualStudio6Generator(cmGlobalGenerator* gg,
-                                cmLocalGenerator* parent,
                                cmState::Snapshot snapshot);

  virtual ~cmLocalVisualStudio6Generator();
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@ -54,9 +54,8 @@ static void cmConvertToWindowsSlash(std::string& s)
 //----------------------------------------------------------------------------
 cmLocalVisualStudio7Generator
 ::cmLocalVisualStudio7Generator(cmGlobalGenerator* gg,
-                                cmLocalGenerator* parent,
                                cmState::Snapshot snapshot):
-  cmLocalVisualStudioGenerator(gg, parent, snapshot)
+  cmLocalVisualStudioGenerator(gg, snapshot)
 {
  this->Internal = new cmLocalVisualStudio7GeneratorInternals(this);
 }
--- a/Source/cmLocalVisualStudio7Generator.h
+++ b/Source/cmLocalVisualStudio7Generator.h
@ -36,7 +36,6 @@ class cmLocalVisualStudio7Generator : public cmLocalVisualStudioGenerator
 public:
  ///! Set cache only and recurse to false by default.
  cmLocalVisualStudio7Generator(cmGlobalGenerator* gg,
-                                cmLocalGenerator* parent,
                                cmState::Snapshot snapshot);

  virtual ~cmLocalVisualStudio7Generator();
--- a/Source/cmLocalVisualStudioGenerator.cxx
+++ b/Source/cmLocalVisualStudioGenerator.cxx
@ -20,9 +20,8 @@
 //----------------------------------------------------------------------------
 cmLocalVisualStudioGenerator
 ::cmLocalVisualStudioGenerator(cmGlobalGenerator* gg,
-                               cmLocalGenerator* parent,
                               cmState::Snapshot snapshot)
-  : cmLocalGenerator(gg, parent, snapshot)
+  : cmLocalGenerator(gg, snapshot)
 {
 }

--- a/Source/cmLocalVisualStudioGenerator.h
+++ b/Source/cmLocalVisualStudioGenerator.h
@ -32,7 +32,6 @@ class cmLocalVisualStudioGenerator : public cmLocalGenerator
 {
 public:
  cmLocalVisualStudioGenerator(cmGlobalGenerator* gg,
-                               cmLocalGenerator* parent,
                               cmState::Snapshot snapshot);
  virtual ~cmLocalVisualStudioGenerator();

--- a/Source/cmLocalXCodeGenerator.cxx
+++ b/Source/cmLocalXCodeGenerator.cxx
@ -16,9 +16,8 @@

 //----------------------------------------------------------------------------
 cmLocalXCodeGenerator::cmLocalXCodeGenerator(cmGlobalGenerator* gg,
-                                             cmLocalGenerator* parent,
                                             cmState::Snapshot snapshot)
-  : cmLocalGenerator(gg, parent, snapshot)
+  : cmLocalGenerator(gg, snapshot)
 {
  // the global generator does this, so do not
  // put these flags into the language flags
--- a/Source/cmLocalXCodeGenerator.h
+++ b/Source/cmLocalXCodeGenerator.h
@ -24,7 +24,7 @@ class cmLocalXCodeGenerator : public cmLocalGenerator
 {
 public:
  ///! Set cache only and recurse to false by default.
-  cmLocalXCodeGenerator(cmGlobalGenerator* gg, cmLocalGenerator* parent,
+  cmLocalXCodeGenerator(cmGlobalGenerator* gg,
                        cmState::Snapshot snapshot);

  virtual ~cmLocalXCodeGenerator();
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@ -1755,7 +1755,7 @@ void cmMakefile::AddSubDirectory(const std::string& srcPath,

  // create a new local generator and set its parent
  cmLocalGenerator *lg2 = this->GetGlobalGenerator()
-        ->MakeLocalGenerator(newSnapshot, this->LocalGenerator);
+        ->MakeLocalGenerator(newSnapshot);
  this->GetGlobalGenerator()->AddMakefile(lg2->GetMakefile());
  this->GetGlobalGenerator()->AddLocalGenerator(lg2);