[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2728-g6a5d577

[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  6a5d577d67e5845aee01d2020ae1dc7252d993e7 (commit)
       via  c77b275f4761ea8f578877288dffac732ad16117 (commit)
      from  bbbd47ce5da77884b0410d687f306fb1c52f886c (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=6a5d577d67e5845aee01d2020ae1dc7252d993e7
commit 6a5d577d67e5845aee01d2020ae1dc7252d993e7
Merge: bbbd47c c77b275
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 24 11:09:03 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 24 11:09:03 2013 -0400

    Merge topic '13582_configured_file_regeneration' into next
    
    c77b275 cmMakefile: Track configured files so we can regenerate them.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c77b275f4761ea8f578877288dffac732ad16117
commit c77b275f4761ea8f578877288dffac732ad16117
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Jun 18 13:50:54 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Jun 24 11:08:05 2013 -0400

    cmMakefile: Track configured files so we can regenerate them.
    
    Currently when a configured file is removed from the build directory,
    running the build command will not regenerate the file. Now detect
    this and will rerun cmake properly when a user issues the build
    command.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index d5d99a0..f3a66ba 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3371,6 +3371,7 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
   std::string sinfile = infile;
   this->AddCMakeDependFile(sinfile);
   cmSystemTools::ConvertToUnixSlashes(soutfile);
+  this->AddCMakeOutputFile(soutfile);
   mode_t perm = 0;
   cmSystemTools::GetPermissions(sinfile.c_str(), perm);
   std::string::size_type pos = soutfile.rfind('/');

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

Summary of changes:


hooks/post-receive
-- 
CMake