[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4084-g6c91d8d

[Robert Maynard]

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  6c91d8df6106403fe6100edb738621deb184e854 (commit)
       via  ce522800d98a308ee7a572dd4d4e1449217329e3 (commit)
      from  9769b53c0126a2f9f952c11066d8451b24ff6986 (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=6c91d8df6106403fe6100edb738621deb184e854
commit 6c91d8df6106403fe6100edb738621deb184e854
Merge: 9769b53 ce52280
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Wed Sep 4 14:00:11 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 4 14:00:11 2013 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ce522800d98a308ee7a572dd4d4e1449217329e3
commit ce522800d98a308ee7a572dd4d4e1449217329e3
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Sep 3 15:31:12 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Wed Sep 4 13:58:11 2013 -0400

    cmMakefile: Do not track CMake temporary files.
    
    We have to also track input files to the configure command. In theory
    the input to a configure command could it self be a file that is
    going to be deleted later ( output from a custom command or configure_file ).

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 93d665c..cada13a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -847,12 +847,22 @@ void cmMakefile::FinalPass()
 
   //remove_if will move all items that don't have a valid file name to the
   //back of the vector
-  std::vector<std::string>::iterator new_end = std::remove_if(
-                                                this->OutputFiles.begin(),
-                                                this->OutputFiles.end(),
-                                                file_not_persistent());
+  std::vector<std::string>::iterator new_output_files_end = std::remove_if(
+                                                     this->OutputFiles.begin(),
+                                                     this->OutputFiles.end(),
+                                                     file_not_persistent() );
   //we just have to erase all items at the back
-  this->OutputFiles.erase(new_end, this->OutputFiles.end() );
+  this->OutputFiles.erase(new_output_files_end, this->OutputFiles.end() );
+
+  //if a configured file is used as input for another configured file,
+  //and then deleted it will show up in the input list files so we
+  //need to scan those too
+  std::vector<std::string>::iterator new_list_files_end = std::remove_if(
+                                                   this->ListFiles.begin(),
+                                                   this->ListFiles.end(),
+                                                   file_not_persistent() );
+
+  this->ListFiles.erase(new_list_files_end, this->ListFiles.end() );
 }
 
 // Generate the output file

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake