diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-24 13:31:44 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-04-24 13:31:49 (GMT) |
| commit | 305e628284fc647087cc8b1e1d7074f826358de6 (patch) | |
| tree | cda9bc002f9fd84485940a60f1592422496fde71 /Source/cmLocalNinjaGenerator.cxx | |
| parent | fa338c97d7e1cd320f79a6eed3b7913fd88ee890 (diff) | |
| parent | d96e5d9a19d613de108ab399663f76a8dd964172 (diff) | |
| download | CMake-305e628284fc647087cc8b1e1d7074f826358de6.zip CMake-305e628284fc647087cc8b1e1d7074f826358de6.tar.gz CMake-305e628284fc647087cc8b1e1d7074f826358de6.tar.bz2 | |
Merge topic 'loosen-object-deps'
d96e5d9a Tests: use BYPRODUCTS in the CustomCommandWorkingDirectory test
664591ce RunCMake.Ninja: add a test for assumed sources
adf60b28 ninja: break unnecessary target dependencies
01c5bb95 RunCMake.Ninja: support passing arguments when running ninja
7f947b60 ninja: remove duplicate order-only dependencies
e9827eba ninja: describe the intermediate order depends target better
b57b7d8e Ninja: Order Fortran dyndep file generation explicitly
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !430
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 00f5e4b..e0e3e54 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -281,9 +281,11 @@ void cmLocalNinjaGenerator::AppendTargetOutputs(cmGeneratorTarget* target, } void cmLocalNinjaGenerator::AppendTargetDepends(cmGeneratorTarget* target, - cmNinjaDeps& outputs) + cmNinjaDeps& outputs, + cmNinjaTargetDepends depends) { - this->GetGlobalNinjaGenerator()->AppendTargetDepends(target, outputs); + this->GetGlobalNinjaGenerator()->AppendTargetDepends(target, outputs, + depends); } void cmLocalNinjaGenerator::AppendCustomCommandDeps( |