[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2724-gfb3e38b

[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  fb3e38b4ba8732324737f59c5ff3a1c33bc7207c (commit)
       via  578efdf60dfc2e7005c8de7883ce5ada4c2fc2f9 (commit)
       via  48786494349cf4c92a38865723a640501e588be8 (commit)
       via  4807eebbb10494cc26473300683c7211d9bc38f5 (commit)
      from  414a447c14b02e00b3917b3f09033236605524ec (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=fb3e38b4ba8732324737f59c5ff3a1c33bc7207c
commit fb3e38b4ba8732324737f59c5ff3a1c33bc7207c
Merge: 414a447 578efdf
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 24 11:05:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 24 11:05:59 2013 -0400

    Merge topic '13582_configured_file_regeneration' into next
    
    578efdf cmMakefile: Track configured files so we can regenerate them.
    4878649 Ninja: Track configured files so we can regenerate them.
    4807eeb Merge branch 'makefile_AddCMakeOutputFile_signature' into 13582_configured_file_regeneration


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=578efdf60dfc2e7005c8de7883ce5ada4c2fc2f9
commit 578efdf60dfc2e7005c8de7883ce5ada4c2fc2f9
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:01:24 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=48786494349cf4c92a38865723a640501e588be8
commit 48786494349cf4c92a38865723a640501e588be8
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: Mon Jun 24 11:01:24 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=4807eebbb10494cc26473300683c7211d9bc38f5
commit 4807eebbb10494cc26473300683c7211d9bc38f5
Merge: 0bd82cb 6dbd4a5
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 24 11:00:38 2013 -0400
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Jun 24 11:00:38 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