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

COMP: Fix build of XCode generator after change to GetSourceFiles signature.

Browse Source
This commit is contained in:
Brad King 2007-05-28 11:02:45 -04:00
parent 2ea5caf13c
commit 14d50b086f
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalXCodeGenerator.cxx
View File

@ -610,12 +610,12 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
sourceBuildPhase->AddAttribute("files", buildFiles); sourceBuildPhase->AddAttribute("files", buildFiles);
sourceBuildPhase->AddAttribute("runOnlyForDeploymentPostprocessing", sourceBuildPhase->AddAttribute("runOnlyForDeploymentPostprocessing",
this->CreateString("0")); this->CreateString("0"));
std::vector<cmSourceFile*> &classes = l->second.GetSourceFiles(); std::vector<cmSourceFile*> const &classes = l->second.GetSourceFiles();
// add all the sources // add all the sources
std::vector<cmXCodeObject*> externalObjFiles; std::vector<cmXCodeObject*> externalObjFiles;
std::vector<cmXCodeObject*> headerFiles; std::vector<cmXCodeObject*> headerFiles;
std::vector<cmXCodeObject*> specialBundleFiles; std::vector<cmXCodeObject*> specialBundleFiles;
for(std::vector<cmSourceFile*>::iterator i = classes.begin(); for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
i != classes.end(); ++i) i != classes.end(); ++i)
{ {
cmXCodeObject* xsf = cmXCodeObject* xsf =
@ -679,7 +679,7 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
typedef std::map<cmStdString, std::vector<cmSourceFile*> > typedef std::map<cmStdString, std::vector<cmSourceFile*> >
mapOfVectorOfSourceFiles; mapOfVectorOfSourceFiles;
mapOfVectorOfSourceFiles bundleFiles; mapOfVectorOfSourceFiles bundleFiles;
for(std::vector<cmSourceFile*>::iterator i = classes.begin(); for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
i != classes.end(); ++i) i != classes.end(); ++i)
{ {
const char* resLoc = (*i)->GetProperty("MACOSX_PACKAGE_LOCATION"); const char* resLoc = (*i)->GetProperty("MACOSX_PACKAGE_LOCATION");
@ -822,10 +822,10 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
= cmtarget.GetPreLinkCommands(); = cmtarget.GetPreLinkCommands();
std::vector<cmCustomCommand> const & postbuild std::vector<cmCustomCommand> const & postbuild
= cmtarget.GetPostBuildCommands(); = cmtarget.GetPostBuildCommands();
std::vector<cmSourceFile*> &classes = cmtarget.GetSourceFiles(); std::vector<cmSourceFile*>const &classes = cmtarget.GetSourceFiles();
// add all the sources // add all the sources
std::vector<cmCustomCommand> commands; std::vector<cmCustomCommand> commands;
for(std::vector<cmSourceFile*>::iterator i = classes.begin(); for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
i != classes.end(); ++i) i != classes.end(); ++i)
{ {
if((*i)->GetCustomCommand()) if((*i)->GetCustomCommand())
@ -2050,7 +2050,7 @@ void cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
file.SetName("Info", file.SetName("Info",
this->CurrentMakefile->GetCurrentOutputDirectory(), this->CurrentMakefile->GetCurrentOutputDirectory(),
"plist", false); "plist", false);
cmtarget.GetSourceFiles().push_back cmtarget.AddSourceFile
(this->CurrentMakefile->AddSource(file)); (this->CurrentMakefile->AddSource(file));
} }
std::vector<cmSourceFile*> classes = cmtarget.GetSourceFiles(); std::vector<cmSourceFile*> classes = cmtarget.GetSourceFiles();
@ -2562,7 +2562,7 @@ cmGlobalXCodeGenerator::OutputXCodeProject(cmLocalGenerator* root,
} }
if(!sameAsTarget) if(!sameAsTarget)
{ {
target.GetSourceFiles().push_back(*i); target.AddSourceFile(*i);
} }
} }
} }