kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'ninja-osx-content-on-target'

Browse Source 
8bbd5db4 Ninja: Make bundle resources a dependency of their target
This commit is contained in:
Brad King 2016-06-27 10:40:30 -04:00 committed by CMake Topic Stage
commit fd36f4e024
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmNinjaTargetGenerator.cxx
View File

@ -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()(
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(

1
Source/cmNinjaTargetGenerator.h
View File

@ -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