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:37 (GMT) |
| commit | 74a65b003323934577b7ec6e768c3640b3ef18bd (patch) | |
| tree | 3f7d7130fdbe30f4b9b91a05f387cda582b5bed3 /Source | |
| parent | d6acaa7bbd39fde96dd0cb54dcebbb318e5ccd23 (diff) | |
| parent | 6fd9c68ed02d6b1dc013a6984f890d2c9457b1c8 (diff) | |
| download | CMake-74a65b003323934577b7ec6e768c3640b3ef18bd.zip CMake-74a65b003323934577b7ec6e768c3640b3ef18bd.tar.gz CMake-74a65b003323934577b7ec6e768c3640b3ef18bd.tar.bz2 | |
Merge topic 'ninja-regenerate-no-recompact' into release-3.20
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')
| -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 7eac169..c502fb8 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -636,8 +636,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()) { |