diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-20 16:46:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-02-20 16:46:21 (GMT) |
| commit | 8a99ccc5ed2ce7204b29126f884121bdc39b7bbe (patch) | |
| tree | 7c65c010a4aaaba6a7ec15d6a9fda46d3552547f | |
| parent | 10f39ca7f7c9b2396101d4ebd7b5933276017b85 (diff) | |
| parent | ed000d7d30434c8cc0be50c8aa19d7ee12e2101b (diff) | |
| download | CMake-8a99ccc5ed2ce7204b29126f884121bdc39b7bbe.zip CMake-8a99ccc5ed2ce7204b29126f884121bdc39b7bbe.tar.gz CMake-8a99ccc5ed2ce7204b29126f884121bdc39b7bbe.tar.bz2 | |
Merge topic 'ninja-cmake-deps'
ed000d7d Ninja: Don't add custom command outputs to phony rule for CMake inputs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1768
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index b251f86..8410609 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1384,8 +1384,14 @@ void cmGlobalNinjaGenerator::WriteTargetRebuildManifest(std::ostream& os) /*explicitDeps=*/cmNinjaDeps(), implicitDeps, /*orderOnlyDeps=*/cmNinjaDeps(), variables); + cmNinjaDeps missingInputs; + std::set_difference(std::make_move_iterator(implicitDeps.begin()), + std::make_move_iterator(implicitDeps.end()), + CustomCommandOutputs.begin(), CustomCommandOutputs.end(), + std::back_inserter(missingInputs)); + this->WritePhonyBuild(os, "A missing CMake input file is not an error.", - implicitDeps, cmNinjaDeps()); + missingInputs, cmNinjaDeps()); } std::string cmGlobalNinjaGenerator::ninjaCmd() const |