[cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.155 1.156
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon May 28 11:02:47 EDT 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv434
Modified Files:
cmGlobalXCodeGenerator.cxx
Log Message:
COMP: Fix build of XCode generator after change to GetSourceFiles signature.
Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- cmGlobalXCodeGenerator.cxx 24 May 2007 21:06:32 -0000 1.155
+++ cmGlobalXCodeGenerator.cxx 28 May 2007 15:02:45 -0000 1.156
@@ -610,12 +610,12 @@
sourceBuildPhase->AddAttribute("files", buildFiles);
sourceBuildPhase->AddAttribute("runOnlyForDeploymentPostprocessing",
this->CreateString("0"));
- std::vector<cmSourceFile*> &classes = l->second.GetSourceFiles();
+ std::vector<cmSourceFile*> const &classes = l->second.GetSourceFiles();
// add all the sources
std::vector<cmXCodeObject*> externalObjFiles;
std::vector<cmXCodeObject*> headerFiles;
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)
{
cmXCodeObject* xsf =
@@ -679,7 +679,7 @@
typedef std::map<cmStdString, std::vector<cmSourceFile*> >
mapOfVectorOfSourceFiles;
mapOfVectorOfSourceFiles bundleFiles;
- for(std::vector<cmSourceFile*>::iterator i = classes.begin();
+ for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
i != classes.end(); ++i)
{
const char* resLoc = (*i)->GetProperty("MACOSX_PACKAGE_LOCATION");
@@ -822,10 +822,10 @@
= cmtarget.GetPreLinkCommands();
std::vector<cmCustomCommand> const & postbuild
= cmtarget.GetPostBuildCommands();
- std::vector<cmSourceFile*> &classes = cmtarget.GetSourceFiles();
+ std::vector<cmSourceFile*>const &classes = cmtarget.GetSourceFiles();
// add all the sources
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)
{
if((*i)->GetCustomCommand())
@@ -2050,7 +2050,7 @@
file.SetName("Info",
this->CurrentMakefile->GetCurrentOutputDirectory(),
"plist", false);
- cmtarget.GetSourceFiles().push_back
+ cmtarget.AddSourceFile
(this->CurrentMakefile->AddSource(file));
}
std::vector<cmSourceFile*> classes = cmtarget.GetSourceFiles();
@@ -2562,7 +2562,7 @@
}
if(!sameAsTarget)
{
- target.GetSourceFiles().push_back(*i);
+ target.AddSourceFile(*i);
}
}
}
More information about the Cmake-commits
mailing list