diff options
author | Gregor Jasny <gjasny@googlemail.com> | 2016-08-19 19:50:48 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-08-31 13:16:44 (GMT) |
commit | df32e564aed43470e304cf21d8c9ac1d5a01d055 (patch) | |
tree | b936ba3992df59535e3e80bba12b20bac3e78d52 /Source/cmGlobalXCodeGenerator.cxx | |
parent | ff88df48e8a693f213a44aee3ad2474f500857b5 (diff) | |
download | CMake-df32e564aed43470e304cf21d8c9ac1d5a01d055.zip CMake-df32e564aed43470e304cf21d8c9ac1d5a01d055.tar.gz CMake-df32e564aed43470e304cf21d8c9ac1d5a01d055.tar.bz2 |
Xcode: Add targets marked as EXCLUDE_FROM_ALL to project (#16101)
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 780ca90..b4bc084 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -2635,13 +2635,10 @@ void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target) } bool cmGlobalXCodeGenerator::CreateGroups( - cmLocalGenerator* root, std::vector<cmLocalGenerator*>& generators) + std::vector<cmLocalGenerator*>& generators) { for (std::vector<cmLocalGenerator*>::iterator i = generators.begin(); i != generators.end(); ++i) { - if (this->IsExcluded(root, *i)) { - continue; - } cmMakefile* mf = (*i)->GetMakefile(); std::vector<cmSourceGroup> sourceGroups = mf->GetSourceGroups(); std::vector<cmGeneratorTarget*> tgts = (*i)->GetGeneratorTargets(); @@ -2873,7 +2870,7 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects( this->MainGroupChildren->AddObject(resourcesGroup); // now create the cmake groups - if (!this->CreateGroups(root, generators)) { + if (!this->CreateGroups(generators)) { return false; } @@ -3041,10 +3038,8 @@ bool cmGlobalXCodeGenerator::CreateXCodeObjects( std::vector<cmXCodeObject*> targets; for (std::vector<cmLocalGenerator*>::iterator i = generators.begin(); i != generators.end(); ++i) { - if (!this->IsExcluded(root, *i)) { - if (!this->CreateXCodeTargets(*i, targets)) { - return false; - } + if (!this->CreateXCodeTargets(*i, targets)) { + return false; } } // loop over all targets and add link and depend info |