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 3e44b0e27c10b197788cd985db279465dd654be6 (commit)
via d3b46e797743fceb52dc6c9168f32363833560d5 (commit)
from 26a455840b3b40179314c50b0d04c31002cd34ee (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=3e44b0e27c10b197788cd985db279465dd654be6
commit 3e44b0e27c10b197788cd985db279465dd654be6
Merge: 26a4558 d3b46e7
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Tue Sep 3 15:52:14 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Sep 3 15:52:14 2013 -0400
Merge topic 'no_track_configured_files' into next
d3b46e7 cmMakefile: Do not track CMake temporary files.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d3b46e797743fceb52dc6c9168f32363833560d5
commit d3b46e797743fceb52dc6c9168f32363833560d5
Author: Robert Maynard <robert.mayn...@kitware.com>
AuthorDate: Tue Sep 3 15:31:12 2013 -0400
Commit: Robert Maynard <robert.mayn...@kitware.com>
CommitDate: Tue Sep 3 15:31:12 2013 -0400
cmMakefile: Do not track CMake temporary files.
Since commit ad502502 (cmMakefile: Track configured files so we can
regenerate them, 2013-06-18) cmMakefile::ConfigureFile records the
configured file as an output file generated by CMake. The intention is
that for make and ninja we can re-run CMake when one of the files it
generates goes missing. However, files configured temporarily in
CMakeTmp directories by Check* modules do not live past the CMake
invocation.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2506209..6c73ebc 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -817,12 +817,13 @@ bool cmMakefile::NeedBackwardsCompatibility(unsigned int
major,
namespace
{
- struct file_exists
+ struct file_is_configured
{
bool operator()(const std::string& path) const
- {
- return cmSystemTools::FileExists(path.c_str());
- }
+ {
+ return !((path.find("CMakeTmp") == path.npos) &&
+ cmSystemTools::FileExists(path.c_str()));
+ }
};
}
@@ -849,10 +850,9 @@ void cmMakefile::FinalPass()
std::vector<std::string>::iterator new_end = std::remove_if(
this->OutputFiles.begin(),
this->OutputFiles.end(),
- file_exists() );
+ file_is_configured() );
//we just have to erase all items at the back
this->OutputFiles.erase(new_end, this->OutputFiles.end() );
-
}
// Generate the output file
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
