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/cmGlobalGenerator.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/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 65c688b..119adaf 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -2030,17 +2030,10 @@ bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root, return this->IsExcluded(rootSnp, snp); } -bool cmGlobalGenerator::IsExcluded(cmLocalGenerator* root, - cmGeneratorTarget* target) const +bool cmGlobalGenerator::IsExcluded(cmGeneratorTarget* target) const { - if (target->GetType() == cmStateEnums::INTERFACE_LIBRARY || - target->GetPropertyAsBool("EXCLUDE_FROM_ALL")) { - // This target is excluded from its directory. - return true; - } - // This target is included in its directory. Check whether the - // directory is excluded. - return this->IsExcluded(root, target->GetLocalGenerator()); + return target->GetType() == cmStateEnums::INTERFACE_LIBRARY || + target->GetPropertyAsBool("EXCLUDE_FROM_ALL"); } void cmGlobalGenerator::GetEnabledLanguages( |