[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6944-g4b5086e

[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  4b5086ed91b080987f01318e9abe13f08dc0ceb7 (commit)
       via  be239ea56c2d01bdd63897622ff4150f7740490a (commit)
      from  9334c82838dec7a40eea8facbbaee1cfdba30c1c (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=4b5086ed91b080987f01318e9abe13f08dc0ceb7
commit 4b5086ed91b080987f01318e9abe13f08dc0ceb7
Merge: 9334c82 be239ea
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Jan 10 09:38:13 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 10 09:38:13 2014 -0500

    Merge topic 'ninja_fix_rerun' into next
    
    be239ea Insert CMakeCache.txt in implicitDeps before sorting.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be239ea56c2d01bdd63897622ff4150f7740490a
commit be239ea56c2d01bdd63897622ff4150f7740490a
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Fri Jan 10 09:37:08 2014 -0500
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Fri Jan 10 09:37:08 2014 -0500

    Insert CMakeCache.txt in implicitDeps before sorting.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 7ff3ef4..3e4e506 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1100,11 +1100,15 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
     temp.insert(temp.end(), of.begin(), of.end());
   }
 
+  //Add the CMakeCache.txt file to the implicit depends so that we catch
+  //when somebody manually modifies the file.
+  implicitDeps.push_back("CMakeCache.txt");
+
   //make sure nothing is in implicit depends twice
   std::sort(implicitDeps.begin(), implicitDeps.end());
   implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
                      implicitDeps.end());
-  implicitDeps.push_back("CMakeCache.txt");
+
 
   //make sure nothing is in outputs depends twice
   std::sort(temp.begin(), temp.end());

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

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


hooks/post-receive
-- 
CMake