diff options
author | Brad King <brad.king@kitware.com> | 2020-11-30 19:54:45 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2020-11-30 19:57:48 (GMT) |
commit | 11f42593626e1909ac9d56d189c6b3540bfff866 (patch) | |
tree | 5ca55a5957630cd32ad1ff8551dda1f835e376c2 /Source/cmGlobalNinjaGenerator.h | |
parent | 5ef23640535dfd6543bd81c86282e38122169af6 (diff) | |
download | CMake-11f42593626e1909ac9d56d189c6b3540bfff866.zip CMake-11f42593626e1909ac9d56d189c6b3540bfff866.tar.gz CMake-11f42593626e1909ac9d56d189c6b3540bfff866.tar.bz2 |
Ninja: Clean metadata after regen during build on Windows with 1.10.2+
Ninja 1.10.2 fixes support for `generator = 1` rules that run metadata
update commands during regeneration while a build is running. Update
the condition added by commit ccaa0bccc4 (Ninja: Do not clean metadata
when re-generating inside a running build, 2020-01-27,
v3.17.0-rc1~73^2) to remove our workaround when Ninja is new enough.
Fixes: #20274
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
-rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index a0724ac..3d92ec9 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -373,6 +373,10 @@ public: { return "1.10"; } + static std::string RequiredNinjaVersionForMetadataOnRegeneration() + { + return "1.10.2"; + } bool SupportsConsolePool() const; bool SupportsImplicitOuts() const; bool SupportsManifestRestat() const; @@ -538,6 +542,7 @@ private: bool NinjaSupportsUnconditionalRecompactTool = false; bool NinjaSupportsCleanDeadTool = false; bool NinjaSupportsMultipleOutputs = false; + bool NinjaSupportsMetadataOnRegeneration = false; private: void InitOutputPathPrefix(); |