diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-16 14:55:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-16 14:55:07 (GMT) |
| commit | 80255a5aa98ff8db6c64bb0a739054f695ac7da7 (patch) | |
| tree | f6b0741510aeaba0fb9aaa62ae9de3ad852c8709 | |
| parent | 5aa01927c0d003d0b7430504f253fa4758c0263a (diff) | |
| parent | 6fd9c68ed02d6b1dc013a6984f890d2c9457b1c8 (diff) | |
| download | CMake-80255a5aa98ff8db6c64bb0a739054f695ac7da7.zip CMake-80255a5aa98ff8db6c64bb0a739054f695ac7da7.tar.gz CMake-80255a5aa98ff8db6c64bb0a739054f695ac7da7.tar.bz2 | |
Merge branch 'ninja-regenerate-no-recompact' into release-3.19
Merge-request: !5916
| -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 02ffaf7..e10c76e 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -588,8 +588,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()) { |