[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1173-g020006f

[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  020006f936a0a8639e5ab51f65c0d2fb647563d1 (commit)
       via  6fac24d750a3ed25c0c58c682a326293d02b7369 (commit)
      from  9f6b633f37bebecc989cc8fc026da999148038f9 (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=020006f936a0a8639e5ab51f65c0d2fb647563d1
commit 020006f936a0a8639e5ab51f65c0d2fb647563d1
Merge: 9f6b633 6fac24d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 13 10:23:23 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 13 10:23:23 2014 -0500

    Merge topic 'ninja_fix_rerun'
    
    6fac24d7 Ninja: Avoid re-running CMake on next build after regeneration

diff --cc Source/cmGlobalNinjaGenerator.cxx
index ec91b0f,3e4e506..65b01db
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@@ -1104,13 -1084,13 +1104,14 @@@ void cmGlobalNinjaGenerator::WriteTarge
              "Re-running CMake...",
              "Rule for re-running cmake.",
              /*depfile=*/ "",
 +            /*deptype=*/ "",
              /*rspfile=*/ "",
              /*rspcontent*/ "",
-             /*restat=*/ false,
+             /*restat=*/ true,
              /*generator=*/ true);
  
-   cmNinjaDeps implicitDeps;
+   cmNinjaDeps implicitDeps, outputs, temp;
+   outputs.push_back(NINJA_BUILD_FILE);
    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, 24 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake