[Cmake-commits] CMake branch, next, updated. v3.3.0-rc4-1121-g2376c7e
Stephen Kelly
steveire at gmail.com
Sat Jul 18 07:32:43 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 2376c7ef8149c7bad49a73d8d62ba09fbdd84883 (commit)
via 640fc5b54a8e7f9e000d5a661f0656a8701639b5 (commit)
via 54cc0c0e1f98508892ce653591178c86ff067364 (commit)
via e77c46664c384211294b6bdfef99c92212826cc6 (commit)
via 8e7d3030773aae4b1784383abd6af4e5cec087c6 (commit)
via 6083ec9a78fd48c66087f9c9e887b9b405c69999 (commit)
via 647b533bce48b741a6b048a1e62b24b9bb2f8d23 (commit)
from f047237fc18b734bcec3d488ba7c8c3ce80d582b (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=2376c7ef8149c7bad49a73d8d62ba09fbdd84883
commit 2376c7ef8149c7bad49a73d8d62ba09fbdd84883
Merge: f047237 640fc5b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 07:32:41 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jul 18 07:32:41 2015 -0400
Merge topic 'remove-ListFileStack' into next
640fc5b5 cmMakefile: Remove unused ListFileStack.
54cc0c0e cmMakefile: Port some users of ListFileStack to cmState.
e77c4666 cmMakefile: Remove obsolete condition.
8e7d3030 cmMakefile: Simplify setting of current snapshot.
6083ec9a cmMakefile: Implement LISTFILE_STACK property in terms of cmState.
647b533b cmMakefile: Implement FormatListFileStack in terms of cmState.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=640fc5b54a8e7f9e000d5a661f0656a8701639b5
commit 640fc5b54a8e7f9e000d5a661f0656a8701639b5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 7 23:40:48 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 13:27:19 2015 +0200
cmMakefile: Remove unused ListFileStack.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f8ac52e..2216264 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -455,7 +455,6 @@ cmMakefile::IncludeScope::IncludeScope(cmMakefile* mf,
// The included file cannot pop our policy scope.
this->Makefile->PushPolicyBarrier();
- this->Makefile->ListFileStack.push_back(filenametoread);
this->Makefile->PushFunctionBlockerBarrier();
this->Makefile->StateSnapshot =
@@ -498,7 +497,6 @@ cmMakefile::IncludeScope::~IncludeScope()
this->EnforceCMP0011();
}
}
- this->Makefile->ListFileStack.pop_back();
}
//----------------------------------------------------------------------------
@@ -593,7 +591,6 @@ public:
ListFileScope(cmMakefile* mf, std::string const& filenametoread)
: Makefile(mf), ReportError(true)
{
- this->Makefile->ListFileStack.push_back(filenametoread);
this->Makefile->PushPolicyBarrier();
long line = 0;
@@ -618,7 +615,6 @@ public:
this->Makefile->PopFunctionBlockerBarrier(this->ReportError);
this->Makefile->PopPolicyBarrier(this->ReportError);
- this->Makefile->ListFileStack.pop_back();
}
void Quiet() { this->ReportError = false; }
@@ -1707,7 +1703,6 @@ public:
this->Makefile->StateSnapshot.GetCurrentSourceDirectory();
currentStart += "/CMakeLists.txt";
this->Makefile->StateSnapshot.SetListFile(currentStart);
- this->Makefile->ListFileStack.push_back(currentStart);
this->Makefile->PushPolicyBarrier();
this->Makefile->PushFunctionBlockerBarrier();
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 82a2279..415b5fe 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -934,9 +934,6 @@ private:
cmPropertyMap Properties;
- // stack of list files being read
- std::vector<std::string> ListFileStack;
-
std::vector<cmCommandContext const*> ContextStack;
std::vector<cmExecutionStatus*> ExecutionStatusStack;
friend class cmMakefileCall;
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=54cc0c0e1f98508892ce653591178c86ff067364
commit 54cc0c0e1f98508892ce653591178c86ff067364
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 13:18:34 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 13:26:06 2015 +0200
cmMakefile: Port some users of ListFileStack to cmState.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 0f55017..f8ac52e 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -260,7 +260,7 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
cmListFileContext lfc;
// We are not currently executing a command. Add whatever context
// information we have.
- lfc.FilePath = this->ListFileStack.back();
+ lfc.FilePath = this->GetExecutionFilePath();
if(!this->GetCMakeInstance()->GetIsInTryCompile())
{
@@ -514,7 +514,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
std::ostringstream w;
w << cmPolicies::GetPolicyWarning(cmPolicies::CMP0011) << "\n"
<< "The included script\n "
- << this->Makefile->ListFileStack.back() << "\n"
+ << this->Makefile->GetExecutionFilePath() << "\n"
<< "affects policy settings. "
<< "CMake is implying the NO_POLICY_SCOPE option for compatibility, "
<< "so the effects are applied to the including context.";
@@ -527,7 +527,7 @@ void cmMakefile::IncludeScope::EnforceCMP0011()
std::ostringstream e;
e << cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0011) << "\n"
<< "The included script\n "
- << this->Makefile->ListFileStack.back() << "\n"
+ << this->Makefile->GetExecutionFilePath() << "\n"
<< "affects policy settings, so it requires this policy to be set.";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e77c46664c384211294b6bdfef99c92212826cc6
commit e77c46664c384211294b6bdfef99c92212826cc6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jul 18 13:19:34 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 13:22:51 2015 +0200
cmMakefile: Remove obsolete condition.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index bd13a17..0f55017 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3436,10 +3436,6 @@ bool cmMakefile::IsLoopBlock() const
std::string cmMakefile::GetExecutionFilePath() const
{
- if (this->ContextStack.empty())
- {
- return std::string();
- }
assert(this->StateSnapshot.IsValid());
return this->StateSnapshot.GetExecutionListFile();
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8e7d3030773aae4b1784383abd6af4e5cec087c6
commit 8e7d3030773aae4b1784383abd6af4e5cec087c6
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 7 23:50:54 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 13:17:24 2015 +0200
cmMakefile: Simplify setting of current snapshot.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 647caba..bd13a17 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1714,8 +1714,7 @@ public:
this->GG = mf->GetGlobalGenerator();
this->CurrentMakefile = this->GG->GetCurrentMakefile();
this->Snapshot = this->GG->GetCMakeInstance()->GetCurrentSnapshot();
- this->GG->GetCMakeInstance()->SetCurrentSnapshot(
- this->GG->GetCMakeInstance()->GetCurrentSnapshot());
+ this->GG->GetCMakeInstance()->SetCurrentSnapshot(this->Snapshot);
this->GG->SetCurrentMakefile(mf);
#if defined(CMAKE_BUILD_WITH_CMAKE)
this->GG->GetFileLockPool().PushFileScope();
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6083ec9a78fd48c66087f9c9e887b9b405c69999
commit 6083ec9a78fd48c66087f9c9e887b9b405c69999
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 7 23:36:13 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 13:12:07 2015 +0200
cmMakefile: Implement LISTFILE_STACK property in terms of cmState.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index cbaf972..647caba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4282,7 +4282,15 @@ const char *cmMakefile::GetProperty(const std::string& prop,
}
else if (prop == "LISTFILE_STACK")
{
- output = cmJoin(this->ListFileStack, ";");
+ std::vector<std::string> listFiles;
+ cmState::Snapshot snp = this->StateSnapshot;
+ while (snp.IsValid())
+ {
+ listFiles.push_back(snp.GetExecutionListFile());
+ snp = snp.GetCallStackParent();
+ }
+ std::reverse(listFiles.begin(), listFiles.end());
+ output = cmJoin(listFiles, ";");
return output.c_str();
}
else if ( prop == "CACHE_VARIABLES" )
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=647b533bce48b741a6b048a1e62b24b9bb2f8d23
commit 647b533bce48b741a6b048a1e62b24b9bb2f8d23
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Jul 7 23:37:20 2015 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jul 18 13:11:45 2015 +0200
cmMakefile: Implement FormatListFileStack in terms of cmState.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 94c77e1..cbaf972 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4439,14 +4439,22 @@ void cmMakefile::AddCMakeDependFilesFromUser()
std::string cmMakefile::FormatListFileStack() const
{
+ std::vector<std::string> listFiles;
+ cmState::Snapshot snp = this->StateSnapshot;
+ while (snp.IsValid())
+ {
+ listFiles.push_back(snp.GetExecutionListFile());
+ snp = snp.GetCallStackParent();
+ }
+ std::reverse(listFiles.begin(), listFiles.end());
std::ostringstream tmp;
- size_t depth = this->ListFileStack.size();
+ size_t depth = listFiles.size();
if (depth > 0)
{
- std::vector<std::string>::const_iterator it = this->ListFileStack.end();
+ std::vector<std::string>::const_iterator it = listFiles.end();
do
{
- if (depth != this->ListFileStack.size())
+ if (depth != listFiles.size())
{
tmp << "\n ";
}
@@ -4457,7 +4465,7 @@ std::string cmMakefile::FormatListFileStack() const
tmp << *it;
depth--;
}
- while (it != this->ListFileStack.begin());
+ while (it != listFiles.begin());
}
return tmp.str();
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 44 +++++++++++++++++++++++++-------------------
Source/cmMakefile.h | 3 ---
2 files changed, 25 insertions(+), 22 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list