[Cmake-commits] CMake branch, next, updated. v3.3.0-rc1-154-ge591a11
Stephen Kelly
steveire at gmail.com
Sat Jun 6 03:36:26 EDT 2015
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 e591a1131a651503cd46e37a31456e13b928da51 (commit)
via 1981c9718b7099670b03535a241c735477d6bc6c (commit)
via 353e422b2ad3d51dfc6c6db968ebcece10cbcc8d (commit)
via 00bfa047481ed9f75444cb4954d7d72f616aef0f (commit)
via db74ce5820e0d0a99649c6b472de74277e3fa6bf (commit)
from 641a3e3f88314ef78a27c55f92a369c844a24b4f (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=e591a1131a651503cd46e37a31456e13b928da51
commit e591a1131a651503cd46e37a31456e13b928da51
Merge: 641a3e3 1981c97
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jun 6 03:36:25 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jun 6 03:36:25 2015 -0400
Merge topic 'clean-up-cmMakefile' into next
1981c971 cmMakefile: Simplify InitializeFromParent method.
353e422b cmMakefile: Remove unused GetPolicies method.
00bfa047 cmMakefile: Out-of-line the cmMakefileCall.
db74ce58 cmMakefile: Inline PushScope into PushFunctionScope.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1981c9718b7099670b03535a241c735477d6bc6c
commit 1981c9718b7099670b03535a241c735477d6bc6c
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:35:55 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 d4bf6c1..3ac77e9 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1485,10 +1485,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);
@@ -1672,7 +1670,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 85451ad..def0c23 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -728,7 +728,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=353e422b2ad3d51dfc6c6db968ebcece10cbcc8d
commit 353e422b2ad3d51dfc6c6db968ebcece10cbcc8d
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:35:55 2015 +0200
cmMakefile: Remove unused GetPolicies method.
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0b328e9..85451ad 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; }
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00bfa047481ed9f75444cb4954d7d72f616aef0f
commit 00bfa047481ed9f75444cb4954d7d72f616aef0f
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 31 19:03:46 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jun 6 09:31:16 2015 +0200
cmMakefile: Out-of-line the cmMakefileCall.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2072418..d4bf6c1 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -5494,3 +5494,15 @@ cmMakefile::MacroPushPop::~MacroPushPop()
{
this->Makefile->PopMacroScope(this->ReportError);
}
+
+cmMakefileCall::cmMakefileCall(cmMakefile* mf, const cmListFileContext& lfc,
+ cmExecutionStatus& status): Makefile(mf)
+{
+ cmMakefile::CallStackEntry entry = {&lfc, &status};
+ this->Makefile->CallStack.push_back(entry);
+}
+
+cmMakefileCall::~cmMakefileCall()
+{
+ this->Makefile->CallStack.pop_back();
+}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 0914a99..0b328e9 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -1084,15 +1084,8 @@ class cmMakefileCall
public:
cmMakefileCall(cmMakefile* mf,
cmListFileContext const& lfc,
- cmExecutionStatus& status): Makefile(mf)
- {
- cmMakefile::CallStackEntry entry = {&lfc, &status};
- this->Makefile->CallStack.push_back(entry);
- }
- ~cmMakefileCall()
- {
- this->Makefile->CallStack.pop_back();
- }
+ cmExecutionStatus& status);
+ ~cmMakefileCall();
private:
cmMakefile* Makefile;
};
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=db74ce5820e0d0a99649c6b472de74277e3fa6bf
commit db74ce5820e0d0a99649c6b472de74277e3fa6bf
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun May 31 23:45:52 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jun 6 09:30:45 2015 +0200
cmMakefile: Inline PushScope into PushFunctionScope.
Make it possible to group the various methods here a different way.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d3a8121..2072418 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1564,7 +1564,13 @@ void cmMakefile::InitializeFromParent()
void cmMakefile::PushFunctionScope(const cmPolicies::PolicyMap& pm)
{
- this->PushScope();
+ this->Internal->PushDefinitions();
+
+ this->PushLoopBlockBarrier();
+
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+ this->GetGlobalGenerator()->GetFileLockPool().PushFunctionScope();
+#endif
this->PushFunctionBlockerBarrier();
@@ -1579,7 +1585,15 @@ void cmMakefile::PopFunctionScope(bool reportError)
this->PopFunctionBlockerBarrier(reportError);
- this->PopScope();
+#if defined(CMAKE_BUILD_WITH_CMAKE)
+ this->GetGlobalGenerator()->GetFileLockPool().PopFunctionScope();
+#endif
+
+ this->PopLoopBlockBarrier();
+
+ this->CheckForUnusedVariables();
+
+ this->Internal->PopDefinitions();
}
void cmMakefile::PushMacroScope(const cmPolicies::PolicyMap& pm)
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list