[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2738-ga194d37

[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  a194d372537b28941bd5531876bb044fdaeed566 (commit)
       via  ad502502dfee281e5b0ad8ac57057d72220b4380 (commit)
       via  4a6397a70c2b467b1285be4c0bae7533eb16f5e0 (commit)
      from  b5e769f10b90c13cab6c4dc35011644d10478031 (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=a194d372537b28941bd5531876bb044fdaeed566
commit a194d372537b28941bd5531876bb044fdaeed566
Merge: b5e769f ad50250
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 25 08:54:33 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 25 08:54:33 2013 -0400

    Merge topic '13582_configured_file_regeneration' into next
    
    ad50250 cmMakefile: Track configured files so we can regenerate them (#13582)
    4a6397a Ninja: Track configured files so we can regenerate them.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad502502dfee281e5b0ad8ac57057d72220b4380
commit ad502502dfee281e5b0ad8ac57057d72220b4380
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Tue Jun 18 13:50:54 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 25 08:51:20 2013 -0400

    cmMakefile: Track configured files so we can regenerate them (#13582)
    
    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('/');

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a6397a70c2b467b1285be4c0bae7533eb16f5e0
commit 4a6397a70c2b467b1285be4c0bae7533eb16f5e0
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Jun 17 11:25:39 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 25 08:51:20 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()),

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

Summary of changes:


hooks/post-receive
-- 
CMake