Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-21 14:40:48 +08:00
Code Issues Projects Releases Wiki Activity

cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-Multi

Browse Source 
Fixes: #20247
This commit is contained in:
Ben Boeckel
2020-01-22 10:41:30 -05:00
parent 593d0f3a57
commit 6cc74b6140
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGlobalNinjaGenerator.cxx
View File

@@ -552,10 +552,19 @@ void cmGlobalNinjaGenerator::Generate()
} }
}; };
if (this->NinjaSupportsCleanDeadTool) { // The `cleandead` tool needs to know about all outputs in the build we just
// wrote out. Ninja-Multi doesn't have a single `build.ninja` we can use that
// is the union of all generated configurations, so we can't run it reliably
// in that case.
if (this->NinjaSupportsCleanDeadTool && !this->IsMultiConfig()) {
run_ninja_tool({ "cleandead" }); run_ninja_tool({ "cleandead" });
} }
if (this->NinjaSupportsUnconditionalRecompactTool) { // The `recompact` tool loads the manifest. As above, we don't have a single
// `build.ninja` to load for this in Ninja-Multi. This may be relaxed in the
// future pending further investigation into how Ninja works upstream
// (ninja#1721).
if (this->NinjaSupportsUnconditionalRecompactTool &&
!this->IsMultiConfig()) {
run_ninja_tool({ "recompact" }); run_ninja_tool({ "recompact" });
} }
if (this->NinjaSupportsRestatTool) { if (this->NinjaSupportsRestatTool) {