Commit 8bbd5db4 authored by Florent Castelli's avatar Florent Castelli Committed by Brad King
Browse files

Ninja: Make bundle resources a dependency of their target

Fixes #13816.
parent c2c2a2f4
...@@ -487,6 +487,10 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatements() ...@@ -487,6 +487,10 @@ void cmNinjaTargetGenerator::WriteObjectBuildStatements()
this->GetLocalGenerator()->AppendTargetDepends(this->GeneratorTarget, this->GetLocalGenerator()->AppendTargetDepends(this->GeneratorTarget,
orderOnlyDeps); 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. // Add order-only dependencies on custom command outputs.
for (std::vector<cmCustomCommand const*>::const_iterator cci = for (std::vector<cmCustomCommand const*>::const_iterator cci =
this->CustomCommands.begin(); this->CustomCommands.begin();
...@@ -717,8 +721,8 @@ void cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()( ...@@ -717,8 +721,8 @@ void cmNinjaTargetGenerator::MacOSXContentGeneratorType::operator()(
this->Generator->GetGlobalGenerator()->WriteMacOSXContentBuild(input, this->Generator->GetGlobalGenerator()->WriteMacOSXContentBuild(input,
output); output);
// Add as a dependency of all target so that it gets called. // Add as a dependency to the target so that it gets called.
this->Generator->GetGlobalGenerator()->AddDependencyToAll(output); this->Generator->ExtraFiles.push_back(output);
} }
void cmNinjaTargetGenerator::addPoolNinjaVariable( void cmNinjaTargetGenerator::addPoolNinjaVariable(
......
...@@ -156,6 +156,7 @@ private: ...@@ -156,6 +156,7 @@ private:
/// List of object files for this target. /// List of object files for this target.
cmNinjaDeps Objects; cmNinjaDeps Objects;
std::vector<cmCustomCommand const*> CustomCommands; std::vector<cmCustomCommand const*> CustomCommands;
cmNinjaDeps ExtraFiles;
}; };
#endif // ! cmNinjaTargetGenerator_h #endif // ! cmNinjaTargetGenerator_h
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment