[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-149-g03a75bf
Daniel Pfeifer
daniel at pfeifer-mail.de
Wed Jun 8 17:17:11 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 03a75bf379f0af616975da7421ea95ee669ee8b9 (commit)
via 9f25fc4dbb0fa3c027beb46c03c8b18507811cab (commit)
via f9cc43ea37d8b4e2a482cb9004cec2bd8f824857 (commit)
via 6e65808516994fe268c4ec87107fca6da6600a9c (commit)
via 87ffd76d1a33885a4cddff70a9909ad88c2aeacc (commit)
via fa169fe8a7f2066eaa40393b4b7979daf42065e4 (commit)
from 7e7dd8ba118242cb86a944d130b91f7464028499 (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=03a75bf379f0af616975da7421ea95ee669ee8b9
commit 03a75bf379f0af616975da7421ea95ee669ee8b9
Merge: 7e7dd8b 9f25fc4
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Jun 8 17:17:09 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 8 17:17:09 2016 -0400
Merge topic 'small-cleanups' into next
9f25fc4d Prefer std::ostream& over derivatives as parameters
f9cc43ea cmake: remove unnused member Verbose
6e658085 cmake: Fix constness of methods
87ffd76d cmake: Make internal method file static
fa169fe8 Parser: Merge identical conditions
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f25fc4dbb0fa3c027beb46c03c8b18507811cab
commit 9f25fc4dbb0fa3c027beb46c03c8b18507811cab
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Jun 8 22:29:15 2016 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Jun 8 23:08:40 2016 +0200
Prefer std::ostream& over derivatives as parameters
diff --git a/Source/CPack/cmCPackNSISGenerator.cxx b/Source/CPack/cmCPackNSISGenerator.cxx
index 9fa588d..5123edd 100644
--- a/Source/CPack/cmCPackNSISGenerator.cxx
+++ b/Source/CPack/cmCPackNSISGenerator.cxx
@@ -516,8 +516,8 @@ int cmCPackNSISGenerator::InitializeInternal()
return this->Superclass::InitializeInternal();
}
-void cmCPackNSISGenerator::CreateMenuLinks(std::ostringstream& str,
- std::ostringstream& deleteStr)
+void cmCPackNSISGenerator::CreateMenuLinks(std::ostream& str,
+ std::ostream& deleteStr)
{
const char* cpackMenuLinks = this->GetOption("CPACK_NSIS_MENU_LINKS");
if (!cpackMenuLinks) {
@@ -621,7 +621,7 @@ bool cmCPackNSISGenerator::SupportsComponentInstallation() const
}
std::string cmCPackNSISGenerator::CreateComponentDescription(
- cmCPackComponent* component, std::ostringstream& macrosOut)
+ cmCPackComponent* component, std::ostream& macrosOut)
{
// Basic description of the component
std::string componentCode = "Section ";
@@ -873,7 +873,7 @@ std::string cmCPackNSISGenerator::CreateDeselectionDependenciesDescription(
}
std::string cmCPackNSISGenerator::CreateComponentGroupDescription(
- cmCPackComponentGroup* group, std::ostringstream& macrosOut)
+ cmCPackComponentGroup* group, std::ostream& macrosOut)
{
if (group->Components.empty() && group->Subgroups.empty()) {
// Silently skip empty groups. NSIS doesn't support them.
diff --git a/Source/CPack/cmCPackNSISGenerator.h b/Source/CPack/cmCPackNSISGenerator.h
index fa52902..ae3ccca 100644
--- a/Source/CPack/cmCPackNSISGenerator.h
+++ b/Source/CPack/cmCPackNSISGenerator.h
@@ -40,7 +40,7 @@ public:
protected:
virtual int InitializeInternal();
- void CreateMenuLinks(std::ostringstream& str, std::ostringstream& deleteStr);
+ void CreateMenuLinks(std::ostream& str, std::ostream& deleteStr);
int PackageFiles();
virtual const char* GetOutputExtension() { return ".exe"; }
virtual const char* GetOutputPostfix() { return "win32"; }
@@ -56,7 +56,7 @@ protected:
/// particular component. Any added macros will be emitted via
/// macrosOut.
std::string CreateComponentDescription(cmCPackComponent* component,
- std::ostringstream& macrosOut);
+ std::ostream& macrosOut);
/// Produce NSIS code that selects all of the components that this component
/// depends on, recursively.
@@ -72,7 +72,7 @@ protected:
/// particular component group, including its components. Any
/// added macros will be emitted via macrosOut.
std::string CreateComponentGroupDescription(cmCPackComponentGroup* group,
- std::ostringstream& macrosOut);
+ std::ostream& macrosOut);
/// Translations any newlines found in the string into \\r\\n, so that the
/// resulting string can be used within NSIS.
diff --git a/Source/CTest/cmCTestBatchTestHandler.cxx b/Source/CTest/cmCTestBatchTestHandler.cxx
index 386c8d5..70f84cb 100644
--- a/Source/CTest/cmCTestBatchTestHandler.cxx
+++ b/Source/CTest/cmCTestBatchTestHandler.cxx
@@ -45,7 +45,7 @@ void cmCTestBatchTestHandler::WriteBatchScript()
fout.close();
}
-void cmCTestBatchTestHandler::WriteSrunArgs(int test, cmsys::ofstream& fout)
+void cmCTestBatchTestHandler::WriteSrunArgs(int test, std::ostream& fout)
{
cmCTestTestHandler::cmCTestTestProperties* properties =
this->Properties[test];
@@ -73,7 +73,7 @@ void cmCTestBatchTestHandler::WriteSrunArgs(int test, cmsys::ofstream& fout)
}
}
-void cmCTestBatchTestHandler::WriteTestCommand(int test, cmsys::ofstream& fout)
+void cmCTestBatchTestHandler::WriteTestCommand(int test, std::ostream& fout)
{
std::vector<std::string> args = this->Properties[test]->Args;
std::vector<std::string> processArgs;
diff --git a/Source/CTest/cmCTestBatchTestHandler.h b/Source/CTest/cmCTestBatchTestHandler.h
index 7a2a4a2..ed60ea3 100644
--- a/Source/CTest/cmCTestBatchTestHandler.h
+++ b/Source/CTest/cmCTestBatchTestHandler.h
@@ -33,8 +33,8 @@ public:
protected:
void WriteBatchScript();
- void WriteSrunArgs(int test, cmsys::ofstream& fout);
- void WriteTestCommand(int test, cmsys::ofstream& fout);
+ void WriteSrunArgs(int test, std::ostream& fout);
+ void WriteTestCommand(int test, std::ostream& fout);
void SubmitBatchScript();
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index f435a1d..da2a649 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -580,8 +580,7 @@ bool cmTarget::PushTLLCommandTrace(TLLSignature signature,
return ret;
}
-void cmTarget::GetTllSignatureTraces(std::ostringstream& s,
- TLLSignature sig) const
+void cmTarget::GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const
{
const char* sigString =
(sig == cmTarget::KeywordTLLSignature ? "keyword" : "plain");
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 71ba0cd..f91e5c6 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -156,7 +156,7 @@ public:
};
bool PushTLLCommandTrace(TLLSignature signature,
cmListFileContext const& lfc);
- void GetTllSignatureTraces(std::ostringstream& s, TLLSignature sig) const;
+ void GetTllSignatureTraces(std::ostream& s, TLLSignature sig) const;
void MergeLinkLibraries(cmMakefile& mf, const std::string& selfname,
const LinkLibraryVectorType& libs);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9cc43ea37d8b4e2a482cb9004cec2bd8f824857
commit f9cc43ea37d8b4e2a482cb9004cec2bd8f824857
Author: Daniel Pfeifer <daniel at pfeifer-mail.de>
AuthorDate: Wed Jun 8 15:18:28 2016 +0200
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Jun 8 23:08:33 2016 +0200
cmake: remove unnused member Verbose
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 605da81..b763426 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -145,7 +145,6 @@ cmake::cmake()
}
#endif
- this->Verbose = false;
this->GlobalGenerator = 0;
this->ProgressCallback = 0;
this->ProgressCallbackClientData = 0;
@@ -555,9 +554,7 @@ void cmake::SetArgs(const std::vector<std::string>& args,
this->VSSolutionFile = args[++i];
}
#endif
- else if (arg.find("-V", 0) == 0) {
- this->Verbose = true;
- } else if (arg.find("-D", 0) == 0) {
+ else if (arg.find("-D", 0) == 0) {
// skip for now
} else if (arg.find("-U", 0) == 0) {
// skip for now
@@ -1989,9 +1986,7 @@ int cmake::GetSystemInformation(std::vector<std::string>& args)
bool writeToStdout = true;
for (unsigned int i = 1; i < args.size(); ++i) {
std::string arg = args[i];
- if (arg.find("-V", 0) == 0) {
- this->Verbose = true;
- } else if (arg.find("-G", 0) == 0) {
+ if (arg.find("-G", 0) == 0) {
std::string value = arg.substr(2);
if (value.empty()) {
++i;
diff --git a/Source/cmake.h b/Source/cmake.h
index 29c010d..4958a05 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -455,7 +455,6 @@ private:
void operator=(const cmake&); // Not implemented.
ProgressCallbackType ProgressCallback;
void* ProgressCallbackClientData;
- bool Verbose;
bool InTryCompile;
WorkingMode CurrentWorkingMode;
bool DebugOutput;
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6e65808516994fe268c4ec87107fca6da6600a9c
commit 6e65808516994fe268c4ec87107fca6da6600a9c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 28 22:10:23 2016 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Jun 8 23:08:29 2016 +0200
cmake: Fix constness of methods
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 4d2dfe8..605da81 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2176,7 +2176,7 @@ static bool cmakeCheckStampList(const char* stampList)
return true;
}
-cmake::MessageType cmake::ConvertMessageType(cmake::MessageType t)
+cmake::MessageType cmake::ConvertMessageType(cmake::MessageType t) const
{
bool warningsAsErrors;
@@ -2200,7 +2200,7 @@ cmake::MessageType cmake::ConvertMessageType(cmake::MessageType t)
return t;
}
-bool cmake::IsMessageTypeVisible(cmake::MessageType t)
+bool cmake::IsMessageTypeVisible(cmake::MessageType t) const
{
bool isVisible = true;
@@ -2296,7 +2296,8 @@ void displayMessage(cmake::MessageType t, std::ostringstream& msg)
}
void cmake::IssueMessage(cmake::MessageType t, std::string const& text,
- cmListFileBacktrace const& backtrace, bool force)
+ cmListFileBacktrace const& backtrace,
+ bool force) const
{
if (!force) {
// override the message type, if needed, for warnings and errors
@@ -2448,7 +2449,7 @@ void cmake::RunCheckForUnusedVariables()
#endif
}
-bool cmake::GetSuppressDevWarnings(cmMakefile const* mf)
+bool cmake::GetSuppressDevWarnings(cmMakefile const* mf) const
{
/*
* The suppression CMake variable may be set in the CMake configuration file
@@ -2482,7 +2483,7 @@ void cmake::SetSuppressDevWarnings(bool b)
cmState::INTERNAL);
}
-bool cmake::GetSuppressDeprecatedWarnings(cmMakefile const* mf)
+bool cmake::GetSuppressDeprecatedWarnings(cmMakefile const* mf) const
{
/*
* The suppression CMake variable may be set in the CMake configuration file
@@ -2517,7 +2518,7 @@ void cmake::SetSuppressDeprecatedWarnings(bool b)
cmState::INTERNAL);
}
-bool cmake::GetDevWarningsAsErrors(cmMakefile const* mf)
+bool cmake::GetDevWarningsAsErrors(cmMakefile const* mf) const
{
if (mf) {
return (mf->IsSet("CMAKE_SUPPRESS_DEVELOPER_ERRORS") &&
@@ -2548,7 +2549,7 @@ void cmake::SetDevWarningsAsErrors(bool b)
cmState::INTERNAL);
}
-bool cmake::GetDeprecatedWarningsAsErrors(cmMakefile const* mf)
+bool cmake::GetDeprecatedWarningsAsErrors(cmMakefile const* mf) const
{
if (mf) {
return mf->IsOn("CMAKE_ERROR_DEPRECATED");
diff --git a/Source/cmake.h b/Source/cmake.h
index f6d335f..29c010d 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -339,7 +339,7 @@ public:
* Returns false, by default, if developer warnings should be shown, true
* otherwise.
*/
- bool GetSuppressDevWarnings(cmMakefile const* mf = NULL);
+ bool GetSuppressDevWarnings(cmMakefile const* mf = NULL) const;
/*
* Set the state of the suppression of developer (author) warnings.
*/
@@ -350,7 +350,7 @@ public:
* Returns false, by default, if deprecated warnings should be shown, true
* otherwise.
*/
- bool GetSuppressDeprecatedWarnings(cmMakefile const* mf = NULL);
+ bool GetSuppressDeprecatedWarnings(cmMakefile const* mf = NULL) const;
/*
* Set the state of the suppression of deprecated warnings.
*/
@@ -361,7 +361,7 @@ public:
* Returns false, by default, if warnings should not be treated as errors,
* true otherwise.
*/
- bool GetDevWarningsAsErrors(cmMakefile const* mf = NULL);
+ bool GetDevWarningsAsErrors(cmMakefile const* mf = NULL) const;
/**
* Set the state of treating developer (author) warnings as errors.
*/
@@ -372,7 +372,7 @@ public:
* Returns false, by default, if warnings should not be treated as errors,
* true otherwise.
*/
- bool GetDeprecatedWarningsAsErrors(cmMakefile const* mf = NULL);
+ bool GetDeprecatedWarningsAsErrors(cmMakefile const* mf = NULL) const;
/**
* Set the state of treating developer (author) warnings as errors.
*/
@@ -382,7 +382,7 @@ public:
void IssueMessage(
cmake::MessageType t, std::string const& text,
cmListFileBacktrace const& backtrace = cmListFileBacktrace(),
- bool force = false);
+ bool force = false) const;
///! run the --build option
int Build(const std::string& dir, const std::string& target,
@@ -493,13 +493,13 @@ private:
* Convert a message type between a warning and an error, based on the state
* of the error output CMake variables, in the cache.
*/
- cmake::MessageType ConvertMessageType(cmake::MessageType t);
+ cmake::MessageType ConvertMessageType(cmake::MessageType t) const;
/*
* Check if messages of this type should be output, based on the state of the
* warning and error output CMake variables, in the cache.
*/
- bool IsMessageTypeVisible(cmake::MessageType t);
+ bool IsMessageTypeVisible(cmake::MessageType t) const;
};
#define CMAKE_STANDARD_OPTIONS_TABLE \
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=87ffd76d1a33885a4cddff70a9909ad88c2aeacc
commit 87ffd76d1a33885a4cddff70a9909ad88c2aeacc
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 28 22:10:25 2016 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Jun 8 23:08:24 2016 +0200
cmake: Make internal method file static
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 89ea955..4d2dfe8 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2225,7 +2225,7 @@ bool cmake::IsMessageTypeVisible(cmake::MessageType t)
return isVisible;
}
-bool cmake::PrintMessagePreamble(cmake::MessageType t, std::ostream& msg)
+static bool printMessagePreamble(cmake::MessageType t, std::ostream& msg)
{
// Construct the message header.
if (t == cmake::FATAL_ERROR) {
@@ -2312,7 +2312,7 @@ void cmake::IssueMessage(cmake::MessageType t, std::string const& text,
}
std::ostringstream msg;
- if (!this->PrintMessagePreamble(t, msg)) {
+ if (!printMessagePreamble(t, msg)) {
return;
}
diff --git a/Source/cmake.h b/Source/cmake.h
index 266c33d..f6d335f 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -500,8 +500,6 @@ private:
* warning and error output CMake variables, in the cache.
*/
bool IsMessageTypeVisible(cmake::MessageType t);
-
- bool PrintMessagePreamble(cmake::MessageType t, std::ostream& msg);
};
#define CMAKE_STANDARD_OPTIONS_TABLE \
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa169fe8a7f2066eaa40393b4b7979daf42065e4
commit fa169fe8a7f2066eaa40393b4b7979daf42065e4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Jan 28 22:10:26 2016 +0100
Commit: Daniel Pfeifer <daniel at pfeifer-mail.de>
CommitDate: Wed Jun 8 23:08:14 2016 +0200
Parser: Merge identical conditions
diff --git a/Source/cmListFileCache.cxx b/Source/cmListFileCache.cxx
index 33731e0..036a2b1 100644
--- a/Source/cmListFileCache.cxx
+++ b/Source/cmListFileCache.cxx
@@ -181,9 +181,6 @@ bool cmListFile::ParseFile(const char* filename, bool topLevel, cmMakefile* mf)
mf->SetPolicyVersion("2.4");
}
}
- }
-
- if (topLevel) {
bool hasProject = false;
// search for a project command
for (std::vector<cmListFileFunction>::iterator i = this->Functions.begin();
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackNSISGenerator.cxx | 8 ++++----
Source/CPack/cmCPackNSISGenerator.h | 6 +++---
Source/CTest/cmCTestBatchTestHandler.cxx | 4 ++--
Source/CTest/cmCTestBatchTestHandler.h | 4 ++--
Source/cmListFileCache.cxx | 3 ---
Source/cmTarget.cxx | 3 +--
Source/cmTarget.h | 2 +-
Source/cmake.cxx | 28 ++++++++++++----------------
Source/cmake.h | 17 +++++++----------
9 files changed, 32 insertions(+), 43 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list