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
This commit is contained in:
Brad King authored and Kitware Robot committed 2018-02-20 11:46:21 -05:00
commit 8a99ccc5ed
1 file changed
+7 -1
+7 -1
View File
@@ -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