cmTarget: Make GetSourceFiles populate an out-vector parameter.
In a future patch, this will also be populated with extra sources from the linked dependencies.
This commit is contained in:
parent
38de54cf6f
commit
531e40b95e
|
@ -398,7 +398,8 @@ void cmExtraCodeBlocksGenerator
|
|||
case cmTarget::OBJECT_LIBRARY:
|
||||
case cmTarget::UTILITY: // can have sources since 2.6.3
|
||||
{
|
||||
const std::vector<cmSourceFile*>&sources=ti->second.GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
ti->second.GetSourceFiles(sources);
|
||||
for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
|
||||
si!=sources.end(); si++)
|
||||
{
|
||||
|
|
|
@ -559,7 +559,8 @@ void cmExtraEclipseCDT4Generator::CreateLinksForTargets(
|
|||
std::vector<cmSourceGroup> sourceGroups=makefile->GetSourceGroups();
|
||||
// get the files from the source lists then add them to the groups
|
||||
cmTarget* tgt = const_cast<cmTarget*>(&ti->second);
|
||||
std::vector<cmSourceFile*>const & files = tgt->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> files;
|
||||
tgt->GetSourceFiles(files);
|
||||
for(std::vector<cmSourceFile*>::const_iterator sfIt = files.begin();
|
||||
sfIt != files.end();
|
||||
sfIt++)
|
||||
|
|
|
@ -237,7 +237,8 @@ void cmExtraSublimeTextGenerator::
|
|||
{
|
||||
cmGeneratorTarget *gtgt = this->GlobalGenerator
|
||||
->GetGeneratorTarget(target);
|
||||
std::vector<cmSourceFile*> const& sourceFiles = target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sourceFiles;
|
||||
target->GetSourceFiles(sourceFiles);
|
||||
std::vector<cmSourceFile*>::const_iterator sourceFilesEnd =
|
||||
sourceFiles.end();
|
||||
for (std::vector<cmSourceFile*>::const_iterator iter =
|
||||
|
|
|
@ -132,8 +132,8 @@ void cmFLTKWrapUICommand::FinalPass()
|
|||
cmSystemTools::Message(msg.c_str(),"Warning");
|
||||
return;
|
||||
}
|
||||
std::vector<cmSourceFile*> const& srcs =
|
||||
target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> srcs;
|
||||
target->GetSourceFiles(srcs);
|
||||
bool found = false;
|
||||
for (unsigned int i = 0; i < srcs.size(); ++i)
|
||||
{
|
||||
|
|
|
@ -284,9 +284,9 @@ bool cmGeneratorTarget::GetPropertyAsBool(const char *prop) const
|
|||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
std::vector<cmSourceFile*> const& cmGeneratorTarget::GetSourceFiles() const
|
||||
void cmGeneratorTarget::GetSourceFiles(std::vector<cmSourceFile*> &files) const
|
||||
{
|
||||
return this->Target->GetSourceFiles();
|
||||
this->Target->GetSourceFiles(files);
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
@ -298,7 +298,8 @@ void cmGeneratorTarget::ClassifySources()
|
|||
bool isObjLib = targetType == cmTarget::OBJECT_LIBRARY;
|
||||
|
||||
std::vector<cmSourceFile*> badObjLib;
|
||||
std::vector<cmSourceFile*> const& sources = this->Target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
this->Target->GetSourceFiles(sources);
|
||||
for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
|
||||
si != sources.end(); ++si)
|
||||
{
|
||||
|
@ -496,7 +497,8 @@ cmTargetTraceDependencies
|
|||
this->CurrentEntry = 0;
|
||||
|
||||
// Queue all the source files already specified for the target.
|
||||
std::vector<cmSourceFile*> const& sources = this->Target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
this->Target->GetSourceFiles(sources);
|
||||
for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
|
||||
si != sources.end(); ++si)
|
||||
{
|
||||
|
|
|
@ -30,7 +30,7 @@ public:
|
|||
const char *GetName() const;
|
||||
const char *GetProperty(const char *prop) const;
|
||||
bool GetPropertyAsBool(const char *prop) const;
|
||||
std::vector<cmSourceFile*> const& GetSourceFiles() const;
|
||||
void GetSourceFiles(std::vector<cmSourceFile*>& files) const;
|
||||
|
||||
void GetObjectSources(std::vector<cmSourceFile*> &) const;
|
||||
const std::string& GetObjectName(cmSourceFile const* file);
|
||||
|
|
|
@ -2884,7 +2884,8 @@ void cmGlobalGenerator::WriteSummary(cmTarget* target)
|
|||
|
||||
// List the source files with any per-source labels.
|
||||
fout << "# Source files and their labels\n";
|
||||
std::vector<cmSourceFile*> const& sources = target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
target->GetSourceFiles(sources);
|
||||
for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
|
||||
si != sources.end(); ++si)
|
||||
{
|
||||
|
|
|
@ -138,7 +138,8 @@ bool cmGlobalKdevelopGenerator
|
|||
for (cmTargets::iterator ti = targets.begin();
|
||||
ti != targets.end(); ti++)
|
||||
{
|
||||
const std::vector<cmSourceFile*>& sources=ti->second.GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
ti->second.GetSourceFiles(sources);
|
||||
for (std::vector<cmSourceFile*>::const_iterator si=sources.begin();
|
||||
si!=sources.end(); si++)
|
||||
{
|
||||
|
|
|
@ -991,7 +991,8 @@ cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
|
|||
}
|
||||
|
||||
// organize the sources
|
||||
std::vector<cmSourceFile*> classes = cmtarget.GetSourceFiles();
|
||||
std::vector<cmSourceFile*> classes;
|
||||
cmtarget.GetSourceFiles(classes);
|
||||
std::sort(classes.begin(), classes.end(), cmSourceFilePathCompare());
|
||||
|
||||
std::vector<cmXCodeObject*> externalObjFiles;
|
||||
|
@ -1360,7 +1361,8 @@ void cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
|
|||
postbuild.push_back(command);
|
||||
}
|
||||
|
||||
std::vector<cmSourceFile*>const &classes = cmtarget.GetSourceFiles();
|
||||
std::vector<cmSourceFile*> classes;
|
||||
cmtarget.GetSourceFiles(classes);
|
||||
// add all the sources
|
||||
std::vector<cmCustomCommand> commands;
|
||||
for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
|
||||
|
@ -2442,7 +2444,8 @@ cmGlobalXCodeGenerator::CreateUtilityTarget(cmTarget& cmtarget)
|
|||
// Add source files without build rules for editing convenience.
|
||||
if(cmtarget.GetType() == cmTarget::UTILITY)
|
||||
{
|
||||
std::vector<cmSourceFile*> const& sources = cmtarget.GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
cmtarget.GetSourceFiles(sources);
|
||||
for(std::vector<cmSourceFile*>::const_iterator i = sources.begin();
|
||||
i != sources.end(); ++i)
|
||||
{
|
||||
|
@ -2945,7 +2948,8 @@ void cmGlobalXCodeGenerator::CreateGroups(cmLocalGenerator* root,
|
|||
cmtarget.AddSourceFile(sf);
|
||||
}
|
||||
|
||||
std::vector<cmSourceFile*> classes = cmtarget.GetSourceFiles();
|
||||
std::vector<cmSourceFile*> classes;
|
||||
cmtarget.GetSourceFiles(classes);
|
||||
|
||||
// Put cmSourceFile instances in proper groups:
|
||||
for(std::vector<cmSourceFile*>::const_iterator s = classes.begin();
|
||||
|
|
|
@ -657,7 +657,8 @@ void cmLocalGenerator::AddBuildTargetRule(const char* llang,
|
|||
cmStdString objs;
|
||||
std::vector<std::string> objVector;
|
||||
// Add all the sources outputs to the depends of the target
|
||||
std::vector<cmSourceFile*> const& classes = target.GetSourceFiles();
|
||||
std::vector<cmSourceFile*> classes;
|
||||
target.GetSourceFiles(classes);
|
||||
for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
|
||||
i != classes.end(); ++i)
|
||||
{
|
||||
|
@ -1631,7 +1632,8 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
|
|||
if(this->Makefile->IsOn("WIN32") &&
|
||||
!(this->Makefile->IsOn("CYGWIN") || this->Makefile->IsOn("MINGW")))
|
||||
{
|
||||
const std::vector<cmSourceFile*>& sources = target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
target->GetSourceFiles(sources);
|
||||
for(std::vector<cmSourceFile*>::const_iterator i = sources.begin();
|
||||
i != sources.end(); ++i)
|
||||
{
|
||||
|
|
|
@ -314,7 +314,8 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
|
|||
std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
|
||||
|
||||
// get the classes from the source lists then add them to the groups
|
||||
std::vector<cmSourceFile*> const & classes = target.GetSourceFiles();
|
||||
std::vector<cmSourceFile*> classes;
|
||||
target.GetSourceFiles(classes);
|
||||
|
||||
// now all of the source files have been properly assigned to the target
|
||||
// now stick them into source groups using the reg expressions
|
||||
|
|
|
@ -1381,7 +1381,8 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
|
|||
|
||||
// get the classes from the source lists then add them to the groups
|
||||
this->ModuleDefinitionFile = "";
|
||||
std::vector<cmSourceFile*>const & classes = target.GetSourceFiles();
|
||||
std::vector<cmSourceFile*> classes;
|
||||
target.GetSourceFiles(classes);
|
||||
for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
|
||||
i != classes.end(); i++)
|
||||
{
|
||||
|
|
|
@ -1152,8 +1152,8 @@ cmMakefileTargetGenerator
|
|||
::DriveCustomCommands(std::vector<std::string>& depends)
|
||||
{
|
||||
// Depend on all custom command outputs.
|
||||
const std::vector<cmSourceFile*>& sources =
|
||||
this->Target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
this->Target->GetSourceFiles(sources);
|
||||
for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
|
||||
source != sources.end(); ++source)
|
||||
{
|
||||
|
|
|
@ -42,8 +42,8 @@ void cmNinjaUtilityTargetGenerator::Generate()
|
|||
}
|
||||
}
|
||||
|
||||
const std::vector<cmSourceFile*>& sources =
|
||||
this->GetTarget()->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
this->GetTarget()->GetSourceFiles(sources);
|
||||
for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
|
||||
source != sources.end(); ++source)
|
||||
{
|
||||
|
|
|
@ -451,7 +451,8 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget const* target,
|
|||
const char* sepFiles = "";
|
||||
const char* sepHeaders = "";
|
||||
|
||||
const std::vector<cmSourceFile*>& srcFiles = target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> srcFiles;
|
||||
target->GetSourceFiles(srcFiles);
|
||||
|
||||
std::string skip_moc;
|
||||
const char *sep = "";
|
||||
|
@ -643,7 +644,8 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget const* target,
|
|||
const char *qtUic = makefile->GetSafeDefinition("QT_UIC_EXECUTABLE");
|
||||
makefile->AddDefinition("_qt_uic_executable", qtUic);
|
||||
|
||||
const std::vector<cmSourceFile*>& srcFiles = target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> srcFiles;
|
||||
target->GetSourceFiles(srcFiles);
|
||||
|
||||
std::string skip_uic;
|
||||
const char *sep = "";
|
||||
|
@ -809,7 +811,8 @@ void cmQtAutoGenerators::InitializeAutoRccTarget(cmTarget* target)
|
|||
{
|
||||
cmMakefile *makefile = target->GetMakefile();
|
||||
|
||||
const std::vector<cmSourceFile*>& srcFiles = target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> srcFiles;
|
||||
target->GetSourceFiles(srcFiles);
|
||||
|
||||
std::vector<cmSourceFile*> newFiles;
|
||||
|
||||
|
@ -855,7 +858,8 @@ void cmQtAutoGenerators::SetupAutoRccTarget(cmTarget const* target)
|
|||
const char* sepRccFiles = "";
|
||||
cmMakefile *makefile = target->GetMakefile();
|
||||
|
||||
const std::vector<cmSourceFile*>& srcFiles = target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> srcFiles;
|
||||
target->GetSourceFiles(srcFiles);
|
||||
|
||||
std::string rccFileFiles;
|
||||
std::string rccFileOptions;
|
||||
|
|
|
@ -530,9 +530,9 @@ bool cmTarget::FindSourceFiles()
|
|||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
std::vector<cmSourceFile*> const& cmTarget::GetSourceFiles() const
|
||||
void cmTarget::GetSourceFiles(std::vector<cmSourceFile*> &files) const
|
||||
{
|
||||
return this->SourceFiles;
|
||||
files = this->SourceFiles;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
|
@ -673,7 +673,8 @@ void cmTarget::ConstructSourceFileFlags() const
|
|||
|
||||
// Handle the MACOSX_PACKAGE_LOCATION property on source files that
|
||||
// were not listed in one of the other lists.
|
||||
std::vector<cmSourceFile*> const& sources = this->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> sources;
|
||||
this->GetSourceFiles(sources);
|
||||
for(std::vector<cmSourceFile*>::const_iterator si = sources.begin();
|
||||
si != sources.end(); ++si)
|
||||
{
|
||||
|
|
|
@ -132,7 +132,7 @@ public:
|
|||
/**
|
||||
* Get the list of the source files used by this target
|
||||
*/
|
||||
std::vector<cmSourceFile*> const& GetSourceFiles() const;
|
||||
void GetSourceFiles(std::vector<cmSourceFile*> &files) const;
|
||||
void AddSourceFile(cmSourceFile* sf);
|
||||
std::vector<std::string> const& GetObjectLibraries() const
|
||||
{
|
||||
|
|
|
@ -699,7 +699,8 @@ void cmVisualStudio10TargetGenerator::WriteGroups()
|
|||
// collect up group information
|
||||
std::vector<cmSourceGroup> sourceGroups =
|
||||
this->Makefile->GetSourceGroups();
|
||||
std::vector<cmSourceFile*> classes = this->Target->GetSourceFiles();
|
||||
std::vector<cmSourceFile*> classes;
|
||||
this->Target->GetSourceFiles(classes);
|
||||
|
||||
std::set<cmSourceGroup*> groupsUsed;
|
||||
for(std::vector<cmSourceFile*>::const_iterator s = classes.begin();
|
||||
|
|
Loading…
Reference in New Issue