[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-523-g272f159

[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  272f159ea60d27ff817bd32335a8edcf2a994fcd (commit)
       via  8bbd5db4c160927cf5e9a2eb2f45fe36a2c2d799 (commit)
      from  f8955baf557a8653e1a2b8e0667b6689931c287b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=272f159ea60d27ff817bd32335a8edcf2a994fcd
commit 272f159ea60d27ff817bd32335a8edcf2a994fcd
Merge: f8955ba 8bbd5db
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 23 15:52:05 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 23 15:52:05 2016 -0400

    Merge topic 'ninja-osx-content-on-target' into next
    
    8bbd5db4 Ninja: Make bundle resources a dependency of their target


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bbd5db4c160927cf5e9a2eb2f45fe36a2c2d799
commit 8bbd5db4c160927cf5e9a2eb2f45fe36a2c2d799
Author:     Florent Castelli <orphis at spotify.com>
AuthorDate: Thu Jun 23 17:01:29 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 23 15:50:03 2016 -0400

    Ninja: Make bundle resources a dependency of their target
    
    Fixes #13816.

diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index b413c33..954c73e 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -487,6 +487,10 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatements()
   this->GetLocalGenerator()->AppendTargetDepends(this->GeneratorTarget,
                                                  orderOnlyDeps);
 
+  // Add order-only dependencies on other files associated with the target.
+  orderOnlyDeps.insert(orderOnlyDeps.end(), this->ExtraFiles.begin(),
+                       this->ExtraFiles.end());
+
   // Add order-only dependencies on custom command outputs.
   for (std::vector<cmCustomCommand const*>::const_iterator cci =
          this->CustomCommands.begin();
@@ -717,8 +721,8 @@ void cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
   this->Generator->GetGlobalGenerator()->WriteMacOSXContentBuild(input,
                                                                  output);
 
-  // Add as a dependency of all target so that it gets called.
-  this->Generator->GetGlobalGenerator()->AddDependencyToAll(output);
+  // Add as a dependency to the target so that it gets called.
+  this->Generator->ExtraFiles.push_back(output);
 }
 
 void cmNinjaTargetGenerator::addPoolNinjaVariable(
diff --git a/Source/cmNinjaTargetGenerator.h b/Source/cmNinjaTargetGenerator.h
index 414aa09..44346c1 100644
--- a/Source/cmNinjaTargetGenerator.h
+++ b/Source/cmNinjaTargetGenerator.h
@@ -156,6 +156,7 @@ private:
   /// List of object files for this target.
   cmNinjaDeps Objects;
   std::vector<cmCustomCommand const*> CustomCommands;
+  cmNinjaDeps ExtraFiles;
 };
 
 #endif // ! cmNinjaTargetGenerator_h

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

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


hooks/post-receive
-- 
CMake