[Cmake-commits] CMake branch, next, updated. v2.8.9-778-g2fed1eb

[Peter Kuemmel]

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  2fed1ebce8f47e09ed2439b1db37bd11ba7ce8b5 (commit)
       via  8f0e08d503c83f47f13efc21437e30b96c114639 (commit)
      from  afda02f43a69cbbd59f8320c2a79ee00656d7121 (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=2fed1ebce8f47e09ed2439b1db37bd11ba7ce8b5
commit 2fed1ebce8f47e09ed2439b1db37bd11ba7ce8b5
Merge: afda02f 8f0e08d
Author:     Peter Kuemmel <syntheticpp at gmx.net>
AuthorDate: Tue Sep 25 16:25:41 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 25 16:25:41 2012 -0400

    Merge topic 'ninja-OBJECT_DEPENDS' into next
    
    8f0e08d Ninja: OBJECT_DEPENDS should set an implicit dependency


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8f0e08d503c83f47f13efc21437e30b96c114639
commit 8f0e08d503c83f47f13efc21437e30b96c114639
Author:     Peter Kümmel <syntheticpp at gmx.net>
AuthorDate: Tue Sep 25 22:21:54 2012 +0200
Commit:     Peter Kümmel <syntheticpp at gmx.net>
CommitDate: Tue Sep 25 22:22:55 2012 +0200

    Ninja: OBJECT_DEPENDS should set an implicit dependency
    
    BUG 13559

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index 385b4a0..356f59b 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -514,8 +514,6 @@ void
 cmNinjaTargetGenerator
 ::WriteObjectBuildStatement(cmSourceFile* source)
 {
-  cmNinjaDeps emptyDeps;
-
   std::string comment;
   const std::string language = source->GetLanguage();
   std::string rule = this->LanguageCompilerRule(language);
@@ -539,11 +537,12 @@ cmNinjaTargetGenerator
   cmNinjaDeps orderOnlyDeps;
   this->GetLocalGenerator()->AppendTargetDepends(this->Target, orderOnlyDeps);
 
+  cmNinjaDeps implicitDeps;
   if(const char* objectDeps = source->GetProperty("OBJECT_DEPENDS")) {
     std::vector<std::string> depList;
     cmSystemTools::ExpandListArgument(objectDeps, depList);
     std::transform(depList.begin(), depList.end(),
-                   std::back_inserter(orderOnlyDeps), MapToNinjaPath());
+                   std::back_inserter(implicitDeps), MapToNinjaPath());
   }
 
   // Add order-only dependencies on custom command outputs.
@@ -625,7 +624,7 @@ cmNinjaTargetGenerator
                                      rule,
                                      outputs,
                                      explicitDeps,
-                                     emptyDeps,
+                                     implicitDeps,
                                      orderOnlyDeps,
                                      vars);
 

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

Summary of changes:
 Source/cmNinjaTargetGenerator.cxx |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake