kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Xcode: Port loops to cmGeneratorTarget.

Browse Source
This commit is contained in:
Stephen Kelly 2015-10-21 20:32:20 +02:00
parent 4bc65d76f1
commit 634155d695
1 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Source/cmGlobalXCodeGenerator.cxx
View File

@ -514,18 +514,18 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin(); for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
l != tgts.end(); l++) l != tgts.end(); l++)
{ {
cmTarget& target = *(*l)->Target; cmGeneratorTarget* target = *l;
if (target.GetType() == cmState::GLOBAL_TARGET) if (target->GetType() == cmState::GLOBAL_TARGET)
{ {
continue; continue;
} }
std::string targetName = target.GetName(); std::string targetName = target->GetName();
if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET)) if (regenerate && (targetName != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
{ {
target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET); target->Target->AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
} }
// make all exe, shared libs and modules // make all exe, shared libs and modules
@ -533,19 +533,19 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
// this will make sure that when the next target is built // this will make sure that when the next target is built
// things are up-to-date // things are up-to-date
if(!makeHelper.empty() && if(!makeHelper.empty() &&
(target.GetType() == cmState::EXECUTABLE || (target->GetType() == cmState::EXECUTABLE ||
// Nope - no post-build for OBJECT_LIRBRARY // Nope - no post-build for OBJECT_LIRBRARY
// target.GetType() == cmState::OBJECT_LIBRARY || // target->GetType() == cmState::OBJECT_LIBRARY ||
target.GetType() == cmState::STATIC_LIBRARY || target->GetType() == cmState::STATIC_LIBRARY ||
target.GetType() == cmState::SHARED_LIBRARY || target->GetType() == cmState::SHARED_LIBRARY ||
target.GetType() == cmState::MODULE_LIBRARY)) target->GetType() == cmState::MODULE_LIBRARY))
{ {
makeHelper[makeHelper.size()-1] = // fill placeholder makeHelper[makeHelper.size()-1] = // fill placeholder
this->PostBuildMakeTarget(target.GetName(), "$(CONFIGURATION)"); this->PostBuildMakeTarget(target->GetName(), "$(CONFIGURATION)");
cmCustomCommandLines commandLines; cmCustomCommandLines commandLines;
commandLines.push_back(makeHelper); commandLines.push_back(makeHelper);
std::vector<std::string> no_byproducts; std::vector<std::string> no_byproducts;
lg->GetMakefile()->AddCustomCommandToTarget(target.GetName(), lg->GetMakefile()->AddCustomCommandToTarget(target->GetName(),
no_byproducts, no_byproducts,
no_depends, no_depends,
commandLines, commandLines,
@ -554,19 +554,17 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
dir.c_str()); dir.c_str());
} }
if(target.GetType() != cmState::INTERFACE_LIBRARY if(target->GetType() != cmState::INTERFACE_LIBRARY
&& !target.GetPropertyAsBool("EXCLUDE_FROM_ALL")) && !target->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{ {
allbuild->AddUtility(target.GetName()); allbuild->AddUtility(target->GetName());
} }
cmGeneratorTarget* targetGT = this->GetGeneratorTarget(&target);
// Refer to the build configuration file for easy editing. // Refer to the build configuration file for easy editing.
listfile = lg->GetCurrentSourceDirectory(); listfile = lg->GetCurrentSourceDirectory();
listfile += "/"; listfile += "/";
listfile += "CMakeLists.txt"; listfile += "CMakeLists.txt";
targetGT->AddSource(listfile.c_str()); target->AddSource(listfile.c_str());
} }
} }
} }
@ -3074,28 +3072,26 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin(); for(std::vector<cmGeneratorTarget*>::iterator l = tgts.begin();
l != tgts.end(); l++) l != tgts.end(); l++)
{ {
cmTarget& cmtarget = *(*l)->Target; cmGeneratorTarget* gtgt = *l;
// Same skipping logic here as in CreateXCodeTargets so that we do not // Same skipping logic here as in CreateXCodeTargets so that we do not
// end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source // end up with (empty anyhow) ALL_BUILD and XCODE_DEPEND_HELPER source
// groups: // groups:
// //
if(cmtarget.GetType() == cmState::GLOBAL_TARGET) if(gtgt->GetType() == cmState::GLOBAL_TARGET)
{ {
continue; continue;
} }
if(cmtarget.GetType() == cmState::INTERFACE_LIBRARY) if(gtgt->GetType() == cmState::INTERFACE_LIBRARY)
{ {
continue; continue;
} }
cmGeneratorTarget* gtgt = this->GetGeneratorTarget(&cmtarget);
// add the soon to be generated Info.plist file as a source for a // add the soon to be generated Info.plist file as a source for a
// MACOSX_BUNDLE file // MACOSX_BUNDLE file
if(cmtarget.GetPropertyAsBool("MACOSX_BUNDLE")) if(gtgt->GetPropertyAsBool("MACOSX_BUNDLE"))
{ {
std::string plist = this->ComputeInfoPListLocation(cmtarget); std::string plist = this->ComputeInfoPListLocation(*gtgt->Target);
mf->GetOrCreateSource(plist, true); mf->GetOrCreateSource(plist, true);
gtgt->AddSource(plist); gtgt->AddSource(plist);
} }
@ -3115,14 +3111,14 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
cmSourceGroup* sourceGroup = cmSourceGroup* sourceGroup =
mf->FindSourceGroup(source.c_str(), sourceGroups); mf->FindSourceGroup(source.c_str(), sourceGroups);
cmXCodeObject* pbxgroup = cmXCodeObject* pbxgroup =
this->CreateOrGetPBXGroup(cmtarget, sourceGroup); this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
std::string key = GetGroupMapKey(cmtarget, sf); std::string key = GetGroupMapKey(*gtgt->Target, sf);
this->GroupMap[key] = pbxgroup; this->GroupMap[key] = pbxgroup;
} }
// Put OBJECT_LIBRARY objects in proper groups: // Put OBJECT_LIBRARY objects in proper groups:
std::vector<std::string> objs; std::vector<std::string> objs;
this->GetGeneratorTarget(&cmtarget)->UseObjectLibraries(objs, ""); gtgt->UseObjectLibraries(objs, "");
for(std::vector<std::string>::const_iterator for(std::vector<std::string>::const_iterator
oi = objs.begin(); oi != objs.end(); ++oi) oi = objs.begin(); oi != objs.end(); ++oi)
{ {
@ -3130,8 +3126,8 @@ bool cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
cmSourceGroup* sourceGroup = cmSourceGroup* sourceGroup =
mf->FindSourceGroup(source.c_str(), sourceGroups); mf->FindSourceGroup(source.c_str(), sourceGroups);
cmXCodeObject* pbxgroup = cmXCodeObject* pbxgroup =
this->CreateOrGetPBXGroup(cmtarget, sourceGroup); this->CreateOrGetPBXGroup(*gtgt->Target, sourceGroup);
std::string key = GetGroupMapKeyFromPath(cmtarget, source); std::string key = GetGroupMapKeyFromPath(*gtgt->Target, source);
this->GroupMap[key] = pbxgroup; this->GroupMap[key] = pbxgroup;
} }
} }