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

Merge topic 'ninja-OBJECT_DEPENDS' 

8f0e08d Ninja: OBJECT_DEPENDS should set an implicit dependency
This commit is contained in:
David Cole 2012-09-28 15:45:11 -04:00 committed by CMake Topic Stage
parent af5fac8d17 8f0e08d503
commit eaba65e308
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmNinjaTargetGenerator.cxx
View File

@ -508,8 +508,6 @@ void
cmNinjaTargetGenerator cmNinjaTargetGenerator
::WriteObjectBuildStatement(cmSourceFile* source) ::WriteObjectBuildStatement(cmSourceFile* source)
{ {
cmNinjaDeps emptyDeps;
std::string comment; std::string comment;
const std::string language = source->GetLanguage(); const std::string language = source->GetLanguage();
std::string rule = this->LanguageCompilerRule(language); std::string rule = this->LanguageCompilerRule(language);
@ -533,11 +531,12 @@ cmNinjaTargetGenerator
cmNinjaDeps orderOnlyDeps; cmNinjaDeps orderOnlyDeps;
this->GetLocalGenerator()->AppendTargetDepends(this->Target, orderOnlyDeps); this->GetLocalGenerator()->AppendTargetDepends(this->Target, orderOnlyDeps);
cmNinjaDeps implicitDeps;
if(const char* objectDeps = source->GetProperty("OBJECT_DEPENDS")) { if(const char* objectDeps = source->GetProperty("OBJECT_DEPENDS")) {
std::vector<std::string> depList; std::vector<std::string> depList;
cmSystemTools::ExpandListArgument(objectDeps, depList); cmSystemTools::ExpandListArgument(objectDeps, depList);
std::transform(depList.begin(), depList.end(), std::transform(depList.begin(), depList.end(),
std::back_inserter(orderOnlyDeps), MapToNinjaPath()); std::back_inserter(implicitDeps), MapToNinjaPath());
} }
// Add order-only dependencies on custom command outputs. // Add order-only dependencies on custom command outputs.
@ -619,7 +618,7 @@ cmNinjaTargetGenerator
rule, rule,
outputs, outputs,
explicitDeps, explicitDeps,
emptyDeps, implicitDeps,
orderOnlyDeps, orderOnlyDeps,
vars); vars);