diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-01 16:25:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-01 16:25:13 (GMT) |
| commit | 62d65286e71c58c88646f2f851edf7669fd40a41 (patch) | |
| tree | e2ac0c77e9ba02a7fd80f1963617a5b5f00a22e9 /Source/cmLocalNinjaGenerator.cxx | |
| parent | ec16afc9e8aed8aebd387c416af5b5eef4ad337a (diff) | |
| parent | 8a15e75fe351579314f92dd9d9e2c6faeac5ad71 (diff) | |
| download | CMake-62d65286e71c58c88646f2f851edf7669fd40a41.zip CMake-62d65286e71c58c88646f2f851edf7669fd40a41.tar.gz CMake-62d65286e71c58c88646f2f851edf7669fd40a41.tar.bz2 | |
Merge topic 'fix-EXCLUDE_FROM_ALL-subdir-all'
8a15e75fe3 Tests: Cover EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
7420843370 Makefiles: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
d713bcb642 Ninja: Factor out per-dir "all" target computation into common generator
a75586c775 Ninja: Simplify top-level "all" target generation
a49cd4d1a7 Ninja: Fix EXCLUDE_FROM_ALL OFF on sub/sub/tgt in sub/all
0733a94f64 Ninja,Makefile: Fix subdir "all" with nested EXCLUDE_FROM_ALL subdir
11fb377eb9 cmLocalUnixMakefileGenerator3: Mark GetRelativeTargetDirectory const
be7857f40d cmLocalCommonGenerator: Mark GetConfigName as const
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3869
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index fed8be5..187a847 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -88,12 +88,6 @@ void cmLocalNinjaGenerator::Generate() auto tg = cmNinjaTargetGenerator::New(target); if (tg) { tg->Generate(); - // Add the target to "all" if required. - if (!this->GetGlobalNinjaGenerator()->IsExcluded( - this->GetGlobalNinjaGenerator()->GetLocalGenerators()[0], - target)) { - this->GetGlobalNinjaGenerator()->AddDependencyToAll(target); - } } } |