diff options
| author | Zack Galbreath <zack.galbreath@kitware.com> | 2019-01-15 23:26:02 (GMT) |
|---|---|---|
| committer | Zack Galbreath <zack.galbreath@kitware.com> | 2019-01-21 16:38:24 (GMT) |
| commit | dc6888573da15cd7ddb9f91b70ef3e6c4e7cae15 (patch) | |
| tree | 8c2c2ded30bd3e5ca2048dc91fba85d03e13db45 /Source/cmGlobalXCodeGenerator.cxx | |
| parent | bd3685b6cfac90bb553df0330e1732c066fe7dca (diff) | |
| download | CMake-dc6888573da15cd7ddb9f91b70ef3e6c4e7cae15.zip CMake-dc6888573da15cd7ddb9f91b70ef3e6c4e7cae15.tar.gz CMake-dc6888573da15cd7ddb9f91b70ef3e6c4e7cae15.tar.bz2 | |
Pass EXCLUDE_FROM_ALL from directory to targets
When a target is created it now inherits the EXCLUDE_FROM_ALL property
from its directory. This change makes it possible to include a target
in "all", even if its directory has been marked as EXCLUDE_FROM_ALL.
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 6618351..2cc3d41 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -522,10 +522,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; @@ -558,8 +554,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()); } } |