diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-27 12:50:54 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-09-30 14:30:28 (GMT) |
| commit | a75586c775eb8f663ca1372ff20f9a51e1ad420d (patch) | |
| tree | da2ae0b6b895709dc89073a0d74edfe58d947343 /Source/cmGlobalNinjaGenerator.h | |
| parent | a49cd4d1a75f20180a349cdfea3fd384eedf3e8b (diff) | |
| download | CMake-a75586c775eb8f663ca1372ff20f9a51e1ad420d.zip CMake-a75586c775eb8f663ca1372ff20f9a51e1ad420d.tar.gz CMake-a75586c775eb8f663ca1372ff20f9a51e1ad420d.tar.bz2 | |
Ninja: Simplify top-level "all" target generation
Remove its dedicated implementation and update the per-directory "all"
target generation to work for the top-level directory too.
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.h')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index 3549946..1bfbffa 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -17,7 +17,6 @@ #include "cmGeneratedFileStream.h" #include "cmGlobalCommonGenerator.h" -#include "cmGlobalGenerator.h" #include "cmGlobalGeneratorFactory.h" #include "cmNinjaTypes.h" #include "cmPolicies.h" @@ -294,18 +293,12 @@ public: cmNinjaDeps& outputs); void AppendTargetDependsClosure(cmGeneratorTarget const* target, cmNinjaOuts& outputs, bool omit_self); - void AddDependencyToAll(cmGeneratorTarget* target); const std::vector<cmLocalGenerator*>& GetLocalGenerators() const { return LocalGenerators; } - bool IsExcluded(cmLocalGenerator* root, cmGeneratorTarget* target) - { - return cmGlobalGenerator::IsExcluded(root, target); - } - int GetRuleCmdLength(const std::string& name) { return RuleCmdLength[name]; } void AddTargetAlias(const std::string& alias, cmGeneratorTarget* target); @@ -372,7 +365,7 @@ private: void WriteUnknownExplicitDependencies(std::ostream& os); void WriteBuiltinTargets(std::ostream& os); - void WriteTargetAll(std::ostream& os); + void WriteTargetDefault(std::ostream& os); void WriteTargetRebuildManifest(std::ostream& os); bool WriteTargetCleanAdditional(std::ostream& os); void WriteTargetClean(std::ostream& os); @@ -399,9 +392,6 @@ private: /// Length of rule command, used by rsp file evaluation std::unordered_map<std::string, int> RuleCmdLength; - /// The set of dependencies to add to the "all" target. - cmNinjaDeps AllDependencies; - bool UsingGCCOnWindows = false; /// The set of custom commands we have seen. |