[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-147-gca69528

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ca6952860c9fda285bee5ce7c199cca0ece1c519 (commit)
       via  f36f86bc1afdc548dfc45ebf602f2869346a1f04 (commit)
       via  586c866adc831e902a41ecd9f06a10ab7f1e7a57 (commit)
      from  b042e8c3c02d1e054881271be331af01c5afed79 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca6952860c9fda285bee5ce7c199cca0ece1c519
commit ca6952860c9fda285bee5ce7c199cca0ece1c519
Merge: b042e8c f36f86b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 03:30:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 6 03:30:03 2015 -0400

    Merge topic 'clean-up-cmMakefile' into next
    
    f36f86bc cmMakefile: Simplify InitializeFromParent method.
    586c866a cmMakefile: Remove unused GetPolicies method.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f36f86bc1afdc548dfc45ebf602f2869346a1f04
commit f36f86bc1afdc548dfc45ebf602f2869346a1f04
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 09:17:45 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jun 6 09:17:45 2015 +0200

    cmMakefile: Simplify InitializeFromParent method.
    
    Provide a parent instead of requiring it to be computed through
    the cmLocalGenerator.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index e94cffa..9bf985d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1494,10 +1494,8 @@ void cmMakefile::AddLinkDirectory(const std::string& dir)
     }
 }
 
-void cmMakefile::InitializeFromParent()
+void cmMakefile::InitializeFromParent(cmMakefile* parent)
 {
-  cmMakefile *parent = this->LocalGenerator->GetParent()->GetMakefile();
-
   // Initialize definitions with the closure of the parent scope.
   this->Internal->InitializeDefinitions(parent);
 
@@ -1681,7 +1679,7 @@ void cmMakefile::Configure()
 
 void cmMakefile::ConfigureSubDirectory(cmMakefile *mf)
 {
-  mf->InitializeFromParent();
+  mf->InitializeFromParent(this);
   std::string currentStart = mf->GetCurrentSourceDirectory();
   if (this->GetCMakeInstance()->GetDebugOutput())
     {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 3f976c7..00218bf 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -730,7 +730,7 @@ public:
   cmPropertyMap &GetProperties() { return this->Properties; }
 
   ///! Initialize a makefile from its parent
-  void InitializeFromParent();
+  void InitializeFromParent(cmMakefile* parent);
 
   void AddInstallGenerator(cmInstallGenerator* g)
     { if(g) this->InstallGenerators.push_back(g); }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=586c866adc831e902a41ecd9f06a10ab7f1e7a57
commit 586c866adc831e902a41ecd9f06a10ab7f1e7a57
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 3 00:47:53 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jun 6 09:16:36 2015 +0200

    cmMakefile: Remove unused GetPolicies method.

diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 1806b5b..3f976c7 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -14,7 +14,6 @@
 
 #include "cmExecutionStatus.h"
 #include "cmListFileCache.h"
-#include "cmPolicies.h"
 #include "cmPropertyMap.h"
 #include "cmSystemTools.h"
 #include "cmTarget.h"
@@ -373,11 +372,6 @@ public:
   };
   friend class PolicyPushPop;
 
-  /**
-    * Get the Policies Instance
-    */
-  cmPolicies *GetPolicies() const;
-
   mutable std::set<cmListFileContext> CMP0054ReportedIds;
 
   /**
diff --git a/Source/cmake.h b/Source/cmake.h
index 0fe7bfc..f0f9411 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -222,9 +222,6 @@ class cmake
   ///! this is called by generators to update the progress
   void UpdateProgress(const char *msg, float prog);
 
-  ///!  get the cmake policies instance
-  cmPolicies *GetPolicies() {return this->Policies;}
-
   ///! Get the variable watch object
   cmVariableWatch* GetVariableWatch() { return this->VariableWatch; }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx |    6 ++----
 Source/cmMakefile.h   |    8 +-------
 Source/cmake.h        |    3 ---
 3 files changed, 3 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake