[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1204-gce362f2

[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, master has been updated
       via  ce362f27d69686b3d72978e5ae0182357737c1a9 (commit)
       via  79859689005716ba38048d087ebe12f329e0229f (commit)
      from  2d5d690ea6a783dd781980bbf507b459c726718b (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=ce362f27d69686b3d72978e5ae0182357737c1a9
commit ce362f27d69686b3d72978e5ae0182357737c1a9
Merge: 2d5d690 7985968
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 16 09:24:13 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 16 09:24:13 2014 -0500

    Merge topic 'revert-ninja_fix_rerun'
    
    79859689 Revert "Ninja: Avoid re-running CMake on next build after regeneration"

diff --cc Source/cmGlobalNinjaGenerator.cxx
index 65b01db,61d0272..ec91b0f
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@@ -1104,14 -1084,12 +1104,13 @@@ void cmGlobalNinjaGenerator::WriteTarge
              "Re-running CMake...",
              "Rule for re-running cmake.",
              /*depfile=*/ "",
 +            /*deptype=*/ "",
              /*rspfile=*/ "",
              /*rspcontent*/ "",
-             /*restat=*/ true,
+             /*restat=*/ false,
              /*generator=*/ true);
  
-   cmNinjaDeps implicitDeps, outputs, temp;
-   outputs.push_back(NINJA_BUILD_FILE);
+   cmNinjaDeps implicitDeps;
    for (std::vector<cmLocalGenerator *>::const_iterator i =
         this->LocalGenerators.begin(); i != this->LocalGenerators.end(); ++i) {
      const std::vector<std::string>& lf = (*i)->GetMakefile()->GetListFiles();

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

Summary of changes:
 Source/cmGlobalNinjaGenerator.cxx |   29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake