diff options
| author | Brad King <brad.king@kitware.com> | 2019-01-25 13:05:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-01-25 13:06:54 (GMT) |
| commit | 24b6e4830d9027e63db7dfafa500aaeb652d3a4c (patch) | |
| tree | b5697a362f3573609e1228bff0629d162b619de1 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 15bc4a25e50d18ba081f31ffd8fc4724b83460b5 (diff) | |
| parent | dc6888573da15cd7ddb9f91b70ef3e6c4e7cae15 (diff) | |
| download | CMake-24b6e4830d9027e63db7dfafa500aaeb652d3a4c.zip CMake-24b6e4830d9027e63db7dfafa500aaeb652d3a4c.tar.gz CMake-24b6e4830d9027e63db7dfafa500aaeb652d3a4c.tar.bz2 | |
Merge topic 'exclude_from_all'
dc6888573d Pass EXCLUDE_FROM_ALL from directory to targets
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2816
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 0dfa17f..0d70a0e 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -538,10 +538,6 @@ void cmGlobalXCodeGenerator::AddExtraTargets( // now make the allbuild depend on all the non-utility targets // in the project for (auto& gen : gens) { - if (this->IsExcluded(root, gen)) { - continue; - } - for (auto target : gen->GetGeneratorTargets()) { if (target->GetType() == cmStateEnums::GLOBAL_TARGET) { continue; @@ -574,8 +570,7 @@ void cmGlobalXCodeGenerator::AddExtraTargets( false, "", false, cmMakefile::AcceptObjectLibraryCommands); } - if (target->GetType() != cmStateEnums::INTERFACE_LIBRARY && - !target->GetPropertyAsBool("EXCLUDE_FROM_ALL")) { + if (!this->IsExcluded(target)) { allbuild->AddUtility(target->GetName()); } } |