[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2659-gaa9cd38

[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  aa9cd38cca21e92317a75266af26ec60667f21cf (commit)
       via  8ee9a02e66685d7c2aa243022ab3277fcc594279 (commit)
       via  7984224b1700bf3d522b630e8fdd52101b1a0e51 (commit)
       via  8bf5c9cc4aff6df2a8719b063266e56e00dac123 (commit)
      from  2ce2ae130a8f7a1a8087f2e5703070890df16bad (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=aa9cd38cca21e92317a75266af26ec60667f21cf
commit aa9cd38cca21e92317a75266af26ec60667f21cf
Merge: 2ce2ae1 8ee9a02
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Jun 18 15:32:54 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 18 15:32:54 2013 -0400

    Merge topic '13582_configured_file_regeneration' into next
    
    8ee9a02 Ninja: Track configured files so we can regenerate them.
    7984224 cmMakefile: Track configured files so we can regenerate them.
    8bf5c9c Merge branch 'makefile_AddCMakeOutputFile_signature' into 13582_configured_file_regeneration


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ee9a02e66685d7c2aa243022ab3277fcc594279
commit 8ee9a02e66685d7c2aa243022ab3277fcc594279
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 17 11:25:39 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue Jun 18 15:31:41 2013 -0400

    Ninja: Track configured files so we can regenerate them.
    
    Unlike the Makefile generator the ninja generator did not tack any of
    its output files, so if they are deleted the generator would not run.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index fff972e..e2c0e18 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -961,6 +961,9 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
        this->LocalGenerators.begin(); i != this->LocalGenerators.end(); ++i) {
     const std::vector<std::string>& lf = (*i)->GetMakefile()->GetListFiles();
     implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
+
+    const std::vector<std::string>& of = (*i)->GetMakefile()->GetOutputFiles();
+    implicitDeps.insert(implicitDeps.end(), of.begin(), of.end());
   }
   std::sort(implicitDeps.begin(), implicitDeps.end());
   implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7984224b1700bf3d522b630e8fdd52101b1a0e51
commit 7984224b1700bf3d522b630e8fdd52101b1a0e51
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: Tue Jun 18 15:31:36 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..a6d61e5 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3369,8 +3369,9 @@ int cmMakefile::ConfigureFile(const char* infile, const char* outfile,
     }
   std::string soutfile = outfile;
   std::string sinfile = infile;
-  this->AddCMakeDependFile(sinfile);
+  this->AddCMakeDependFile(infile);
   cmSystemTools::ConvertToUnixSlashes(soutfile);
+  this->AddCMakeOutputFile(soutfile);
   mode_t perm = 0;
   cmSystemTools::GetPermissions(sinfile.c_str(), perm);
   std::string::size_type pos = soutfile.rfind('/');

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bf5c9cc4aff6df2a8719b063266e56e00dac123
commit 8bf5c9cc4aff6df2a8719b063266e56e00dac123
Merge: 82771f1 0b4a23c
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Jun 18 15:30:52 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Tue Jun 18 15:30:52 2013 -0400

    Merge branch 'makefile_AddCMakeOutputFile_signature' into 13582_configured_file_regeneration


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

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


hooks/post-receive
-- 
CMake