diff options
| author | Florent Castelli <orphis@spotify.com> | 2016-06-23 15:01:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-23 19:50:03 (GMT) |
| commit | 8bbd5db4c160927cf5e9a2eb2f45fe36a2c2d799 (patch) | |
| tree | ab7b6ecbfb05f0456eeb757163eebf431e853f3d /Source/cmNinjaTargetGenerator.cxx | |
| parent | c2c2a2f4c7e23192d3d8cd8d53a427d651ef3137 (diff) | |
| download | CMake-8bbd5db4c160927cf5e9a2eb2f45fe36a2c2d799.zip CMake-8bbd5db4c160927cf5e9a2eb2f45fe36a2c2d799.tar.gz CMake-8bbd5db4c160927cf5e9a2eb2f45fe36a2c2d799.tar.bz2 | |
Ninja: Make bundle resources a dependency of their target
Fixes #13816.
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
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( |