diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2012-09-25 20:21:54 (GMT) |
|---|---|---|
| committer | Peter Kümmel <syntheticpp@gmx.net> | 2012-09-25 20:22:55 (GMT) |
| commit | 8f0e08d503c83f47f13efc21437e30b96c114639 (patch) | |
| tree | 542ac6a198ff80b1a9fafbfec097137b92f7caf4 /Source/cmNinjaTargetGenerator.cxx | |
| parent | f00f58fe13f4b0dbee7c7efb76694b7a7f9cac2e (diff) | |
| download | CMake-8f0e08d503c83f47f13efc21437e30b96c114639.zip CMake-8f0e08d503c83f47f13efc21437e30b96c114639.tar.gz CMake-8f0e08d503c83f47f13efc21437e30b96c114639.tar.bz2 | |
Ninja: OBJECT_DEPENDS should set an implicit dependency
BUG 13559
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 385b4a0..356f59b 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -514,8 +514,6 @@ void cmNinjaTargetGenerator ::WriteObjectBuildStatement(cmSourceFile* source) { - cmNinjaDeps emptyDeps; - std::string comment; const std::string language = source->GetLanguage(); std::string rule = this->LanguageCompilerRule(language); @@ -539,11 +537,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. @@ -625,7 +624,7 @@ cmNinjaTargetGenerator rule, outputs, explicitDeps, - emptyDeps, + implicitDeps, orderOnlyDeps, vars); |