diff options
| author | David Cole <david.cole@kitware.com> | 2012-09-28 19:45:11 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-09-28 19:45:11 (GMT) |
| commit | eaba65e308b06d478eda4ef80247c2319a3840ab (patch) | |
| tree | 170e42e4bbff4340b1a2ce7ac9aa47770f0305bb /Source/cmNinjaTargetGenerator.cxx | |
| parent | af5fac8d171a41c526c9f0ebc732366ca2139296 (diff) | |
| parent | 8f0e08d503c83f47f13efc21437e30b96c114639 (diff) | |
| download | CMake-eaba65e308b06d478eda4ef80247c2319a3840ab.zip CMake-eaba65e308b06d478eda4ef80247c2319a3840ab.tar.gz CMake-eaba65e308b06d478eda4ef80247c2319a3840ab.tar.bz2 | |
Merge topic 'ninja-OBJECT_DEPENDS'
8f0e08d Ninja: OBJECT_DEPENDS should set an implicit dependency
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index 57997ee..8db06d3 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -508,8 +508,6 @@ void cmNinjaTargetGenerator ::WriteObjectBuildStatement(cmSourceFile* source) { - cmNinjaDeps emptyDeps; - std::string comment; const std::string language = source->GetLanguage(); std::string rule = this->LanguageCompilerRule(language); @@ -533,11 +531,12 @@ cmNinjaTargetGenerator cmNinjaDeps orderOnlyDeps; this->GetLocalGenerator()->AppendTargetDepends(this->Target, orderOnlyDeps); + cmNinjaDeps implicitDeps; if(const char* objectDeps = source->GetProperty("OBJECT_DEPENDS")) { std::vector<std::string> depList; cmSystemTools::ExpandListArgument(objectDeps, depList); std::transform(depList.begin(), depList.end(), - std::back_inserter(orderOnlyDeps), MapToNinjaPath()); + std::back_inserter(implicitDeps), MapToNinjaPath()); } // Add order-only dependencies on custom command outputs. @@ -619,7 +618,7 @@ cmNinjaTargetGenerator rule, outputs, explicitDeps, - emptyDeps, + implicitDeps, orderOnlyDeps, vars); |