[Cmake-commits] CMake branch, master, updated. v3.8.1-1125-g99b1ff7
Kitware Robot
kwrobot at kitware.com
Thu May 11 09:55:05 EDT 2017
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, master has been updated
via 99b1ff714b45d34ad84a5d897b4fce30a9ec3041 (commit)
via fdd341ebfdf1da3e53332303eb93d5db1feaed6d (commit)
via 67a8d907adbc587021e9eba603cb789da09926d8 (commit)
via 0c519c70297bd2fd6e139d74c6b175c304c09192 (commit)
from f1b9fe5fc4af1bab7d551c48600ca3ebb717db8f (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=99b1ff714b45d34ad84a5d897b4fce30a9ec3041
commit 99b1ff714b45d34ad84a5d897b4fce30a9ec3041
Merge: f1b9fe5 fdd341e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu May 11 13:54:13 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu May 11 09:54:19 2017 -0400
Merge topic 'dead-code-removal'
fdd341eb cmFindCommon: remove unused function SetMakefile
67a8d907 cmExecutionStatus: Remove arguments from setters
0c519c70 bootstrap: Remove leftovers from cmBootstrapCommands
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !821
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdd341ebfdf1da3e53332303eb93d5db1feaed6d
commit fdd341ebfdf1da3e53332303eb93d5db1feaed6d
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sun Jan 8 22:27:16 2017 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed May 10 15:58:28 2017 +0200
cmFindCommon: remove unused function SetMakefile
diff --git a/Source/cmFindCommon.cxx b/Source/cmFindCommon.cxx
index 110195c..6ffbb6e 100644
--- a/Source/cmFindCommon.cxx
+++ b/Source/cmFindCommon.cxx
@@ -334,15 +334,3 @@ void cmFindCommon::ComputeFinalPaths()
std::for_each(this->SearchPaths.begin(), this->SearchPaths.end(),
&AddTrailingSlash);
}
-
-void cmFindCommon::SetMakefile(cmMakefile* makefile)
-{
- cmCommand::SetMakefile(makefile);
-
- // If we are building for Apple (OSX or also iphone), make sure
- // that frameworks and bundles are searched first.
- if (this->Makefile->IsOn("APPLE")) {
- this->SearchFrameworkFirst = true;
- this->SearchAppBundleFirst = true;
- }
-}
diff --git a/Source/cmFindCommon.h b/Source/cmFindCommon.h
index 426d233..bbb7a38 100644
--- a/Source/cmFindCommon.h
+++ b/Source/cmFindCommon.h
@@ -14,8 +14,6 @@
#include "cmPathLabel.h"
#include "cmSearchPath.h"
-class cmMakefile;
-
/** \class cmFindCommon
* \brief Base class for FIND_XXX implementations.
*
@@ -105,7 +103,6 @@ protected:
bool CheckCommonArgument(std::string const& arg);
void AddPathSuffix(std::string const& arg);
- void SetMakefile(cmMakefile* makefile);
bool NoDefaultPath;
bool NoCMakePath;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67a8d907adbc587021e9eba603cb789da09926d8
commit 67a8d907adbc587021e9eba603cb789da09926d8
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Mon Dec 26 10:30:31 2016 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue May 9 23:49:14 2017 +0200
cmExecutionStatus: Remove arguments from setters
The setters are only used to set boolean values. The values are never
reset individually.
diff --git a/Source/cmBreakCommand.cxx b/Source/cmBreakCommand.cxx
index 9bb6137..3772c6f 100644
--- a/Source/cmBreakCommand.cxx
+++ b/Source/cmBreakCommand.cxx
@@ -41,7 +41,7 @@ bool cmBreakCommand::InitialPass(std::vector<std::string> const& args,
}
}
- status.SetBreakInvoked(true);
+ status.SetBreakInvoked();
if (!args.empty()) {
bool issueMessage = true;
diff --git a/Source/cmContinueCommand.cxx b/Source/cmContinueCommand.cxx
index 53d035d..2298a05 100644
--- a/Source/cmContinueCommand.cxx
+++ b/Source/cmContinueCommand.cxx
@@ -19,7 +19,7 @@ bool cmContinueCommand::InitialPass(std::vector<std::string> const& args,
return true;
}
- status.SetContinueInvoked(true);
+ status.SetContinueInvoked();
if (!args.empty()) {
this->Makefile->IssueMessage(cmake::FATAL_ERROR,
diff --git a/Source/cmExecutionStatus.h b/Source/cmExecutionStatus.h
index fd3c416..ac5fe1d 100644
--- a/Source/cmExecutionStatus.h
+++ b/Source/cmExecutionStatus.h
@@ -11,16 +11,13 @@
class cmExecutionStatus
{
public:
- cmExecutionStatus() { this->Clear(); }
-
- void SetReturnInvoked(bool val) { this->ReturnInvoked = val; }
- bool GetReturnInvoked() { return this->ReturnInvoked; }
-
- void SetBreakInvoked(bool val) { this->BreakInvoked = val; }
- bool GetBreakInvoked() { return this->BreakInvoked; }
-
- void SetContinueInvoked(bool val) { this->ContinueInvoked = val; }
- bool GetContinueInvoked() { return this->ContinueInvoked; }
+ cmExecutionStatus()
+ : ReturnInvoked(false)
+ , BreakInvoked(false)
+ , ContinueInvoked(false)
+ , NestedError(false)
+ {
+ }
void Clear()
{
@@ -29,8 +26,18 @@ public:
this->ContinueInvoked = false;
this->NestedError = false;
}
- void SetNestedError(bool val) { this->NestedError = val; }
- bool GetNestedError() { return this->NestedError; }
+
+ void SetReturnInvoked() { this->ReturnInvoked = true; }
+ bool GetReturnInvoked() const { return this->ReturnInvoked; }
+
+ void SetBreakInvoked() { this->BreakInvoked = true; }
+ bool GetBreakInvoked() const { return this->BreakInvoked; }
+
+ void SetContinueInvoked() { this->ContinueInvoked = true; }
+ bool GetContinueInvoked() const { return this->ContinueInvoked; }
+
+ void SetNestedError() { this->NestedError = true; }
+ bool GetNestedError() const { return this->NestedError; }
private:
bool ReturnInvoked;
diff --git a/Source/cmForEachCommand.cxx b/Source/cmForEachCommand.cxx
index 6273f6e..8346b23 100644
--- a/Source/cmForEachCommand.cxx
+++ b/Source/cmForEachCommand.cxx
@@ -58,7 +58,7 @@ bool cmForEachFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff,
status.Clear();
mf.ExecuteCommand(this->Functions[c], status);
if (status.GetReturnInvoked()) {
- inStatus.SetReturnInvoked(true);
+ inStatus.SetReturnInvoked();
// restore the variable to its prior value
mf.AddDefinition(this->Args[0], oldDef.c_str());
return true;
diff --git a/Source/cmFunctionCommand.cxx b/Source/cmFunctionCommand.cxx
index 31adcb7..e5fe988 100644
--- a/Source/cmFunctionCommand.cxx
+++ b/Source/cmFunctionCommand.cxx
@@ -126,7 +126,7 @@ bool cmFunctionHelperCommand::InvokeInitialPass(
// The error message should have already included the call stack
// so we do not need to report an error here.
functionScope.Quiet();
- inStatus.SetNestedError(true);
+ inStatus.SetNestedError();
return false;
}
if (status.GetReturnInvoked()) {
diff --git a/Source/cmIfCommand.cxx b/Source/cmIfCommand.cxx
index 421c3dd..0972664 100644
--- a/Source/cmIfCommand.cxx
+++ b/Source/cmIfCommand.cxx
@@ -137,15 +137,15 @@ bool cmIfFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff,
status.Clear();
mf.ExecuteCommand(this->Functions[c], status);
if (status.GetReturnInvoked()) {
- inStatus.SetReturnInvoked(true);
+ inStatus.SetReturnInvoked();
return true;
}
if (status.GetBreakInvoked()) {
- inStatus.SetBreakInvoked(true);
+ inStatus.SetBreakInvoked();
return true;
}
if (status.GetContinueInvoked()) {
- inStatus.SetContinueInvoked(true);
+ inStatus.SetContinueInvoked();
return true;
}
}
diff --git a/Source/cmMacroCommand.cxx b/Source/cmMacroCommand.cxx
index 583f801..4830371 100644
--- a/Source/cmMacroCommand.cxx
+++ b/Source/cmMacroCommand.cxx
@@ -156,15 +156,15 @@ bool cmMacroHelperCommand::InvokeInitialPass(
// The error message should have already included the call stack
// so we do not need to report an error here.
macroScope.Quiet();
- inStatus.SetNestedError(true);
+ inStatus.SetNestedError();
return false;
}
if (status.GetReturnInvoked()) {
- inStatus.SetReturnInvoked(true);
+ inStatus.SetReturnInvoked();
return true;
}
if (status.GetBreakInvoked()) {
- inStatus.SetBreakInvoked(true);
+ inStatus.SetBreakInvoked();
return true;
}
}
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index cb11060..3569abe 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -118,7 +118,7 @@ void cmMakefile::IssueMessage(cmake::MessageType t,
{
if (!this->ExecutionStatusStack.empty()) {
if ((t == cmake::FATAL_ERROR) || (t == cmake::INTERNAL_ERROR)) {
- this->ExecutionStatusStack.back()->SetNestedError(true);
+ this->ExecutionStatusStack.back()->SetNestedError();
}
}
this->GetCMakeInstance()->IssueMessage(t, text, this->GetBacktrace());
diff --git a/Source/cmReturnCommand.cxx b/Source/cmReturnCommand.cxx
index f8b3129..ceea8b4 100644
--- a/Source/cmReturnCommand.cxx
+++ b/Source/cmReturnCommand.cxx
@@ -8,6 +8,6 @@
bool cmReturnCommand::InitialPass(std::vector<std::string> const&,
cmExecutionStatus& status)
{
- status.SetReturnInvoked(true);
+ status.SetReturnInvoked();
return true;
}
diff --git a/Source/cmWhileCommand.cxx b/Source/cmWhileCommand.cxx
index 38ea637..24d7bf1 100644
--- a/Source/cmWhileCommand.cxx
+++ b/Source/cmWhileCommand.cxx
@@ -82,7 +82,7 @@ bool cmWhileFunctionBlocker::IsFunctionBlocked(const cmListFileFunction& lff,
cmExecutionStatus status;
mf.ExecuteCommand(this->Functions[c], status);
if (status.GetReturnInvoked()) {
- inStatus.SetReturnInvoked(true);
+ inStatus.SetReturnInvoked();
return true;
}
if (status.GetBreakInvoked()) {
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c519c70297bd2fd6e139d74c6b175c304c09192
commit 0c519c70297bd2fd6e139d74c6b175c304c09192
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Sat Apr 29 17:33:48 2017 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Tue May 9 23:45:29 2017 +0200
bootstrap: Remove leftovers from cmBootstrapCommands
diff --git a/bootstrap b/bootstrap
index 9ac3904..515e8be 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1454,8 +1454,6 @@ for a in ${CMAKE_CXX_SOURCES}; do
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
echo " ${cmake_cxx_compiler} ${cmake_cxx_flags} ${src_flags} -c ${src} -o ${a}.o" >> "${cmake_bootstrap_dir}/Makefile"
done
-echo "cmBootstrapCommands1.o : $cmBootstrapCommands1Deps" >> "${cmake_bootstrap_dir}/Makefile"
-echo "cmBootstrapCommands2.o : $cmBootstrapCommands2Deps" >> "${cmake_bootstrap_dir}/Makefile"
for a in ${CMAKE_C_SOURCES}; do
src=`cmake_escape "${cmake_source_dir}/Source/${a}.c"`
echo "${a}.o : ${src} ${dep}" >> "${cmake_bootstrap_dir}/Makefile"
-----------------------------------------------------------------------
Summary of changes:
Source/cmBreakCommand.cxx | 2 +-
Source/cmContinueCommand.cxx | 2 +-
Source/cmExecutionStatus.h | 31 +++++++++++++++++++------------
Source/cmFindCommon.cxx | 12 ------------
Source/cmFindCommon.h | 3 ---
Source/cmForEachCommand.cxx | 2 +-
Source/cmFunctionCommand.cxx | 2 +-
Source/cmIfCommand.cxx | 6 +++---
Source/cmMacroCommand.cxx | 6 +++---
Source/cmMakefile.cxx | 2 +-
Source/cmReturnCommand.cxx | 2 +-
Source/cmWhileCommand.cxx | 2 +-
bootstrap | 2 --
13 files changed, 32 insertions(+), 42 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list