[Cmake-commits] CMake branch, next, updated. v3.5.1-938-g99da075
Brad King
brad.king at kitware.com
Fri Apr 15 08:46:47 EDT 2016
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 99da0758b5fcc23db7a958a27dc51ef825dbb393 (commit)
via cc7aed77a8774c565c8bc6c4965f10e3560f8d64 (commit)
via c50285dee66394b68eb3df17d190072289a33a4e (commit)
via b6ed71b17c888c5f79129871bf7bc865b43063e3 (commit)
via a559f0f6b020697a064517637ae04f0733ffc6ea (commit)
via 7503deb2c55a32f72c9ec34f17a800d4ab1e4c75 (commit)
from 9f4234351d70f1aebe82b58cb0ee7bb3f6e7ea4c (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99da0758b5fcc23db7a958a27dc51ef825dbb393
commit 99da0758b5fcc23db7a958a27dc51ef825dbb393
Merge: 9f42343 cc7aed7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 15 08:46:46 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 15 08:46:46 2016 -0400
Merge topic 'minor-cleanups' into next
cc7aed77 cmLocalGenerator: Use own IssueMessage method
c50285de cmOutputConverter: Assert construction with a valid snapshot
b6ed71b1 cmMakefile: Move cmMakefileCall to .cxx file
a559f0f6 cmWhileCommand: Simplify context construction
7503deb2 cmIfCommand: Simplify execution context construction
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc7aed77a8774c565c8bc6c4965f10e3560f8d64
commit cc7aed77a8774c565c8bc6c4965f10e3560f8d64
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 14 16:35:12 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 15 08:34:05 2016 -0400
cmLocalGenerator: Use own IssueMessage method
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 0195b9e..746bcab 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1608,7 +1608,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
"For compatibility with older versions of CMake, "
"additional flags may be added to export symbols on all "
"executables regardless of thier ENABLE_EXPORTS property.";
- this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, w.str());
+ this->IssueMessage(cmake::AUTHOR_WARNING, w.str());
}
case cmPolicies::OLD:
// OLD behavior is to always add the flags
@@ -1616,7 +1616,7 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
break;
case cmPolicies::REQUIRED_IF_USED:
case cmPolicies::REQUIRED_ALWAYS:
- this->Makefile->IssueMessage(
+ this->IssueMessage(
cmake::FATAL_ERROR,
cmPolicies::GetRequiredPolicyError(cmPolicies::CMP0065)
);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c50285dee66394b68eb3df17d190072289a33a4e
commit c50285dee66394b68eb3df17d190072289a33a4e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 14 11:49:32 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 15 08:34:05 2016 -0400
cmOutputConverter: Assert construction with a valid snapshot
We unconditionally use information from the snapshot so it must be
valid.
diff --git a/Source/cmOutputConverter.cxx b/Source/cmOutputConverter.cxx
index 5acae2f..59fb2e9 100644
--- a/Source/cmOutputConverter.cxx
+++ b/Source/cmOutputConverter.cxx
@@ -22,6 +22,7 @@
cmOutputConverter::cmOutputConverter(cmState::Snapshot snapshot)
: StateSnapshot(snapshot), LinkScriptShell(false)
{
+ assert(this->StateSnapshot.IsValid());
}
//----------------------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6ed71b17c888c5f79129871bf7bc865b43063e3
commit b6ed71b17c888c5f79129871bf7bc865b43063e3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 14 11:02:40 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 15 08:32:15 2016 -0400
cmMakefile: Move cmMakefileCall to .cxx file
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 7be6b88..162d3e7 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -222,6 +222,26 @@ void cmMakefile::PrintCommandTrace(const cmListFileFunction& lff) const
cmSystemTools::Message(msg.str().c_str());
}
+// Helper class to make sure the call stack is valid.
+class cmMakefileCall
+{
+public:
+ cmMakefileCall(cmMakefile* mf, const cmCommandContext& lfc,
+ cmExecutionStatus& status): Makefile(mf)
+ {
+ this->Makefile->ContextStack.push_back(&lfc);
+ this->Makefile->ExecutionStatusStack.push_back(&status);
+ }
+
+ ~cmMakefileCall()
+ {
+ this->Makefile->ExecutionStatusStack.pop_back();
+ this->Makefile->ContextStack.pop_back();
+ }
+private:
+ cmMakefile* Makefile;
+};
+
//----------------------------------------------------------------------------
bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff,
cmExecutionStatus &status)
@@ -5148,16 +5168,3 @@ cmMakefile::MacroPushPop::~MacroPushPop()
{
this->Makefile->PopMacroScope(this->ReportError);
}
-
-cmMakefileCall::cmMakefileCall(cmMakefile* mf, const cmCommandContext& lfc,
- cmExecutionStatus& status): Makefile(mf)
-{
- this->Makefile->ContextStack.push_back(&lfc);
- this->Makefile->ExecutionStatusStack.push_back(&status);
-}
-
-cmMakefileCall::~cmMakefileCall()
-{
- this->Makefile->ExecutionStatusStack.pop_back();
- this->Makefile->ContextStack.pop_back();
-}
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 45f2efb..7217944 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -959,17 +959,4 @@ private:
mutable bool SuppressWatches;
};
-//----------------------------------------------------------------------------
-// Helper class to make sure the call stack is valid.
-class cmMakefileCall
-{
-public:
- cmMakefileCall(cmMakefile* mf,
- cmCommandContext const& lfc,
- cmExecutionStatus& status);
- ~cmMakefileCall();
-private:
- cmMakefile* Makefile;
-};
-
#endif
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a559f0f6b020697a064517637ae04f0733ffc6ea
commit a559f0f6b020697a064517637ae04f0733ffc6ea
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 14 10:46:41 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 15 08:31:59 2016 -0400
cmWhileCommand: Simplify context construction
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index aabbe27..7bb78bf 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -55,13 +55,9 @@ IsFunctionBlocked(const cmListFileFunction& lff, cmMakefile &mf,
commandContext.Line = execContext.Line;
commandContext.Name = execContext.Name;
- cmListFileContext conditionContext =
- cmListFileContext::FromCommandContext(
- commandContext,
- this->GetStartingContext().FilePath);
-
cmConditionEvaluator conditionEvaluator(
- mf, conditionContext,
+ mf,
+ this->GetStartingContext(),
mf.GetBacktrace(commandContext));
bool isTrue = conditionEvaluator.IsTrue(
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7503deb2c55a32f72c9ec34f17a800d4ab1e4c75
commit 7503deb2c55a32f72c9ec34f17a800d4ab1e4c75
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 14 10:31:44 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 15 08:29:42 2016 -0400
cmIfCommand: Simplify execution context construction
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 9a07dde..fc54ca5 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -203,15 +203,9 @@ bool cmIfCommand
cmake::MessageType status;
- cmListFileContext execContext = this->Makefile->GetExecutionContext();
-
- cmCommandContext commandContext;
- commandContext.Line = execContext.Line;
- commandContext.Name = execContext.Name;
-
cmConditionEvaluator conditionEvaluator(
- *(this->Makefile), cmListFileContext::FromCommandContext(
- commandContext, execContext.FilePath),
+ *(this->Makefile),
+ this->Makefile->GetExecutionContext(),
this->Makefile->GetBacktrace());
bool isTrue = conditionEvaluator.IsTrue(
-----------------------------------------------------------------------
Summary of changes:
Source/cmIfCommand.cxx | 10 ++--------
Source/cmLocalGenerator.cxx | 4 ++--
Source/cmMakefile.cxx | 33 ++++++++++++++++++++-------------
Source/cmMakefile.h | 13 -------------
Source/cmOutputConverter.cxx | 1 +
Source/cmWhileCommand.cxx | 8 ++------
6 files changed, 27 insertions(+), 42 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list