[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4080-gefb4a9e
Brad King
brad.king at kitware.com
Wed Sep 4 11:53:20 EDT 2013
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 efb4a9ed79e1d936893a46724857864b10b9118c (commit)
via 3a22457e18b2bab39f64e5e6ae1e3dfb24c44429 (commit)
from 04bb8e59f11f972ae196033a8fe328c59c984f93 (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=efb4a9ed79e1d936893a46724857864b10b9118c
commit efb4a9ed79e1d936893a46724857864b10b9118c
Merge: 04bb8e5 3a22457
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 4 11:53:17 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 4 11:53:17 2013 -0400
Merge topic 'no_track_configured_files' into next
3a22457 cmMakefile: Improve remove_if functor name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3a22457e18b2bab39f64e5e6ae1e3dfb24c44429
commit 3a22457e18b2bab39f64e5e6ae1e3dfb24c44429
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 4 11:50:10 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 4 11:50:10 2013 -0400
cmMakefile: Improve remove_if functor name
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6c73ebc..93d665c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -817,11 +817,11 @@ bool cmMakefile::NeedBackwardsCompatibility(unsigned int major,
namespace
{
- struct file_is_configured
+ struct file_not_persistent
{
bool operator()(const std::string& path) const
{
- return !((path.find("CMakeTmp") == path.npos) &&
+ return !(path.find("CMakeTmp") == path.npos &&
cmSystemTools::FileExists(path.c_str()));
}
};
@@ -850,7 +850,7 @@ void cmMakefile::FinalPass()
std::vector<std::string>::iterator new_end = std::remove_if(
this->OutputFiles.begin(),
this->OutputFiles.end(),
- file_is_configured() );
+ file_not_persistent());
//we just have to erase all items at the back
this->OutputFiles.erase(new_end, this->OutputFiles.end() );
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list