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 2c62af2d4bc7c5f1d66869b49da138f76586c155 (commit)
via bac93dcf192d8680cd72570682d6593da9818088 (commit)
via 1e994985d83b09d71b4928a61a75d1cf3861aaec (commit)
via 5ae3966d75593b05a9658af8d2fdd47c2bf48a4d (commit)
via 443180fb9915eefe0b232875505632ffb9fabb95 (commit)
from 6dacf55a79b849ccefb468166d012686b1ed3a18 (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=2c62af2d4bc7c5f1d66869b49da138f76586c155
commit 2c62af2d4bc7c5f1d66869b49da138f76586c155
Merge: 6dacf55 bac93dc
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sat Nov 5 18:56:12 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sat Nov 5 18:56:12 2016 -0400
Merge topic 'clang-tidy' into next
bac93dcf cmGeneratorTarget: Don't assing a bool to a string
1e994985 cmGlobalNinjaGenerator: Suppress clang-tidy warning
5ae3966d cmCTestSubmitHandler: Remove redundant c_str()
443180fb cmCPluginAPI: Fix clang-tidy findings
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bac93dcf192d8680cd72570682d6593da9818088
commit bac93dcf192d8680cd72570682d6593da9818088
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sat Nov 5 23:54:57 2016 +0100
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Sat Nov 5 23:54:57 2016 +0100
cmGeneratorTarget: Don't assing a bool to a string
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index ca056c0..ca3e373 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -3945,7 +3945,6 @@ std::string cmGeneratorTarget::GetFortranModuleDirectory(
std::string const& working_dir) const
{
if (!this->FortranModuleDirectoryCreated) {
- this->FortranModuleDirectory = true;
this->FortranModuleDirectory =
this->CreateFortranModuleDirectory(working_dir);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e994985d83b09d71b4928a61a75d1cf3861aaec
commit 1e994985d83b09d71b4928a61a75d1cf3861aaec
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sat Nov 5 23:51:30 2016 +0100
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Sat Nov 5 23:51:30 2016 +0100
cmGlobalNinjaGenerator: Suppress clang-tidy warning
diff --git a/Source/cmGlobalNinjaGenerator.cxx
b/Source/cmGlobalNinjaGenerator.cxx
index 830ab7f..22de7c4 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -130,7 +130,7 @@ std::string cmGlobalNinjaGenerator::EncodeLiteral(const
std::string& lit)
std::string cmGlobalNinjaGenerator::EncodePath(const std::string& path)
{
- std::string result = path;
+ std::string result = path; // NOLINT(clang-tidy)
#ifdef _WIN32
if (this->IsGCCOnWindows())
std::replace(result.begin(), result.end(), '\\', '/');
@@ -283,7 +283,7 @@ void cmGlobalNinjaGenerator::WriteCustomCommandBuild(
bool restat, const cmNinjaDeps& outputs, const cmNinjaDeps& deps,
const cmNinjaDeps& orderOnly)
{
- std::string cmd = command;
+ std::string cmd = command; // NOLINT(clang-tidy)
#ifdef _WIN32
if (cmd.empty())
// TODO Shouldn't an empty command be handled by ninja?
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ae3966d75593b05a9658af8d2fdd47c2bf48a4d
commit 5ae3966d75593b05a9658af8d2fdd47c2bf48a4d
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sat Nov 5 23:46:24 2016 +0100
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Sat Nov 5 23:46:24 2016 +0100
cmCTestSubmitHandler: Remove redundant c_str()
diff --git a/Source/CTest/cmCTestSubmitHandler.cxx
b/Source/CTest/cmCTestSubmitHandler.cxx
index d21471d..d10f7ad 100644
--- a/Source/CTest/cmCTestSubmitHandler.cxx
+++ b/Source/CTest/cmCTestSubmitHandler.cxx
@@ -926,7 +926,7 @@ bool cmCTestSubmitHandler::SubmitUsingXMLRPC(
return false;
}
size_t fileSize = static_cast<size_t>(st.st_size);
- FILE* fp = cmsys::SystemTools::Fopen(local_file.c_str(), "rb");
+ FILE* fp = cmsys::SystemTools::Fopen(local_file, "rb");
if (!fp) {
cmCTestLog(this->CTest, ERROR_MESSAGE,
" Cannot open file: " << local_file << std::endl);
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=443180fb9915eefe0b232875505632ffb9fabb95
commit 443180fb9915eefe0b232875505632ffb9fabb95
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Sat Nov 5 23:44:29 2016 +0100
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Sat Nov 5 23:44:29 2016 +0100
cmCPluginAPI: Fix clang-tidy findings
diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx
index b70074e..d1f8446 100644
--- a/Source/cmCPluginAPI.cxx
+++ b/Source/cmCPluginAPI.cxx
@@ -408,7 +408,7 @@ char CCONV* cmExpandVariablesInString(void* arg, const
char* source,
std::string result = mf->ExpandVariablesInString(
barf, (escapeQuotes ? true : false), (atOnly ? true : false));
char* res = static_cast<char*>(malloc(result.size() + 1));
- if (result.size()) {
+ if (!result.empty()) {
strcpy(res, result.c_str());
}
res[result.size()] = '\0';
@@ -570,7 +570,7 @@ void* CCONV cmAddSource(void* arg, void* arg2)
rsf->GetProperties() = osf->Properties;
for (std::vector<std::string>::iterator i = osf->Depends.begin();
i != osf->Depends.end(); ++i) {
- rsf->AddDepend(i->c_str());
+ rsf->AddDepend(*i);
}
// Create the proxy for the real source file.
@@ -676,7 +676,7 @@ void CCONV cmSourceFileSetName(void* arg, const char* name,
const char* dir,
std::string hname = pathname;
if (cmSystemTools::FileExists(hname.c_str())) {
sf->SourceName = cmSystemTools::GetFilenamePath(name);
- if (sf->SourceName.size() > 0) {
+ if (!sf->SourceName.empty()) {
sf->SourceName += "/";
}
sf->SourceName += cmSystemTools::GetFilenameWithoutLastExtension(name);
@@ -756,7 +756,7 @@ void CCONV cmSourceFileSetName2(void* arg, const char*
name, const char* dir,
fname += ".";
fname += ext;
}
- sf->FullPath = cmSystemTools::CollapseFullPath(fname.c_str(), dir);
+ sf->FullPath = cmSystemTools::CollapseFullPath(fname, dir);
cmSystemTools::ConvertToUnixSlashes(sf->FullPath);
sf->SourceExtension = ext;
}
-----------------------------------------------------------------------
Summary of changes:
Source/CTest/cmCTestSubmitHandler.cxx | 2 +-
Source/cmCPluginAPI.cxx | 8 ++++----
Source/cmGeneratorTarget.cxx | 1 -
Source/cmGlobalNinjaGenerator.cxx | 4 ++--
4 files changed, 7 insertions(+), 8 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
