[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4082-g9769b53

[Brad King]

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  9769b53c0126a2f9f952c11066d8451b24ff6986 (commit)
       via  b2a9fdda023f426d9eadf5a41b49c3e71dd85bf4 (commit)
      from  efb4a9ed79e1d936893a46724857864b10b9118c (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=9769b53c0126a2f9f952c11066d8451b24ff6986
commit 9769b53c0126a2f9f952c11066d8451b24ff6986
Merge: efb4a9e b2a9fdd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 4 11:55:02 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 4 11:55:02 2013 -0400

    Merge topic 'no_track_configured_files' into next
    
    b2a9fdd cmMakefile: Do not track CMake temporary files.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2a9fdda023f426d9eadf5a41b49c3e71dd85bf4
commit b2a9fdda023f426d9eadf5a41b49c3e71dd85bf4
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Sep 3 15:31:12 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 4 11:51:39 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..93d665c 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_not_persistent
   {
     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_not_persistent());
   //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:


hooks/post-receive
-- 
CMake