diff options
| author | Brad King <brad.king@kitware.com> | 2023-02-08 16:40:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-02-08 16:41:29 (GMT) |
| commit | 398844667b2d709db5701150f967f20cb94b8a86 (patch) | |
| tree | f985829605012e51a593e7d6aa7b238090f872be | |
| parent | 70244ffb198ac49345b786cd1b6d68b39118e3be (diff) | |
| parent | cc118ddd7098a038812ce0ae174d35a840e17ad0 (diff) | |
| download | CMake-398844667b2d709db5701150f967f20cb94b8a86.zip CMake-398844667b2d709db5701150f967f20cb94b8a86.tar.gz CMake-398844667b2d709db5701150f967f20cb94b8a86.tar.bz2 | |
Merge topic 'ninja-no-cleandead'
cc118ddd70 cmGlobalNinjaGenerator: Remove unused member
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8178
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 7 | ||||
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 93aa30a..b5e1529 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -318,12 +318,6 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os, } } - if (build.Variables.count("dyndep") > 0) { - // The ninja 'cleandead' operation does not account for outputs - // discovered by 'dyndep' bindings. Avoid removing them. - this->DisableCleandead = true; - } - os << buildStr << arguments << assignments << "\n"; } @@ -591,7 +585,6 @@ void cmGlobalNinjaGenerator::Generate() this->InitOutputPathPrefix(); this->TargetAll = this->NinjaOutputPath("all"); this->CMakeCacheFile = this->NinjaOutputPath("CMakeCache.txt"); - this->DisableCleandead = false; this->DiagnosedCxxModuleNinjaSupport = false; this->ClangTidyExportFixesDirs.clear(); this->ClangTidyExportFixesFiles.clear(); diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index 1436c83..6d23e89 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -596,7 +596,6 @@ private: std::string OutputPathPrefix; std::string TargetAll; std::string CMakeCacheFile; - bool DisableCleandead = false; struct ByConfig { |