[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7216-g26f9199

[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  26f9199fc435c1a8e7b64e71a752a24aa7874a74 (commit)
       via  2c426bfb2dbb0d00aee4eb68c53ddaa18d32bdaa (commit)
      from  d90b7918159ff2878df73aade35ee5d4710508ea (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=26f9199fc435c1a8e7b64e71a752a24aa7874a74
commit 26f9199fc435c1a8e7b64e71a752a24aa7874a74
Merge: d90b791 2c426bf
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 22 08:41:09 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 22 08:41:09 2014 -0500

    Merge topic 'ninja-normalize-cmake-rerun-deps' into next
    
    2c426bfb Ninja: Normalize paths of CMake re-run rule dependencies


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c426bfb2dbb0d00aee4eb68c53ddaa18d32bdaa
commit 2c426bfb2dbb0d00aee4eb68c53ddaa18d32bdaa
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 21 13:18:40 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 21 14:29:55 2014 -0500

    Ninja: Normalize paths of CMake re-run rule dependencies
    
    Send all implicit dependencies through ConvertToNinjaPath.
    Add CMakeCache.txt before uniquifying the list.

diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx
index 5e1f1ed..731bc00 100644
--- a/Source/cmGlobalNinjaGenerator.cxx
+++ b/Source/cmGlobalNinjaGenerator.cxx
@@ -1110,16 +1110,24 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os)
             /*restat=*/ false,
             /*generator=*/ true);
 
+  cmLocalNinjaGenerator *ng = static_cast<cmLocalNinjaGenerator *>(lg);
+
   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();
-    implicitDeps.insert(implicitDeps.end(), lf.begin(), lf.end());
-  }
+  for(std::vector<cmLocalGenerator*>::const_iterator i =
+        this->LocalGenerators.begin(); i != this->LocalGenerators.end(); ++i)
+    {
+    std::vector<std::string> const& lf = (*i)->GetMakefile()->GetListFiles();
+    for(std::vector<std::string>::const_iterator fi = lf.begin();
+        fi != lf.end(); ++fi)
+      {
+      implicitDeps.push_back(ng->ConvertToNinjaPath(fi->c_str()));
+      }
+    }
+  implicitDeps.push_back("CMakeCache.txt");
+
   std::sort(implicitDeps.begin(), implicitDeps.end());
   implicitDeps.erase(std::unique(implicitDeps.begin(), implicitDeps.end()),
                      implicitDeps.end());
-  implicitDeps.push_back("CMakeCache.txt");
 
   this->WriteBuild(os,
                    "Re-run CMake if any of its inputs changed.",

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

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


hooks/post-receive
-- 
CMake