diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-17 13:39:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-03-17 13:39:38 (GMT) |
| commit | 03a61ae509d3c7f74519c003a4ca9e809d794915 (patch) | |
| tree | ff2e1c82bb6d6cc897acc16fd851c079e253e4f0 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 3e112cc510d6a25394d8a0a730191f6bb4204b73 (diff) | |
| parent | 6fd9c68ed02d6b1dc013a6984f890d2c9457b1c8 (diff) | |
| download | CMake-03a61ae509d3c7f74519c003a4ca9e809d794915.zip CMake-03a61ae509d3c7f74519c003a4ca9e809d794915.tar.gz CMake-03a61ae509d3c7f74519c003a4ca9e809d794915.tar.bz2 | |
Merge topic 'ninja-regenerate-no-recompact'
6fd9c68ed0 Ninja: Do not recompact deps log in regeneration during a build
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5916
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 36be45c..6937639 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -630,8 +630,9 @@ void cmGlobalNinjaGenerator::CleanMetaData() // `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 && expectBuildManifest && - !missingBuildManifest) { + if (this->NinjaSupportsUnconditionalRecompactTool && + !this->GetCMakeInstance()->GetRegenerateDuringBuild() && + expectBuildManifest && !missingBuildManifest) { run_ninja_tool({ "recompact" }); } if (this->NinjaSupportsRestatTool && this->OutputPathPrefix.empty()) { |