summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2007-05-28 14:25:03 (GMT)
committerBrad King <brad.king@kitware.com>2007-05-28 14:25:03 (GMT)
commit3f2dd9bc54d1dfc47fcf8e22979e409ad50e875a (patch)
treea0aa1d56e870d1a6b758de964cf2bcbb9a24868a
parentba8ec0d5cf2efac0107841dfcfb2534852d3bfe7 (diff)
downloadCMake-3f2dd9bc54d1dfc47fcf8e22979e409ad50e875a.zip
CMake-3f2dd9bc54d1dfc47fcf8e22979e409ad50e875a.tar.gz
CMake-3f2dd9bc54d1dfc47fcf8e22979e409ad50e875a.tar.bz2
ENH: Made cmTarget::GetSourceFiles method return reference to const so addition of cmSourceFile pointers must be done with an access method in cmTarget.
-rw-r--r--Source/cmFLTKWrapUICommand.cxx4
-rw-r--r--Source/cmLocalGenerator.cxx6
-rw-r--r--Source/cmTarget.cxx2
-rw-r--r--Source/cmTarget.h4
4 files changed, 9 insertions, 7 deletions
diff --git a/Source/cmFLTKWrapUICommand.cxx b/Source/cmFLTKWrapUICommand.cxx
index f761a59..80abd67 100644
--- a/Source/cmFLTKWrapUICommand.cxx
+++ b/Source/cmFLTKWrapUICommand.cxx
@@ -158,8 +158,8 @@ void cmFLTKWrapUICommand::FinalPass()
// Generate code for all the .fl files
for(size_t classNum = 0; classNum < lastHeadersClass; classNum++)
{
- this->Makefile->GetTargets()[this->Target].GetSourceFiles().
- push_back(this->GeneratedSourcesClasses[classNum]);
+ this->Makefile->GetTargets()[this->Target]
+ .AddSourceFile(this->GeneratedSourcesClasses[classNum]);
}
}
}
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index bc0aca4..f831282 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -622,8 +622,8 @@ void cmLocalGenerator::AddBuildTargetRule(const char* llang, cmTarget& target)
cmStdString objs;
std::vector<std::string> objVector;
// Add all the sources outputs to the depends of the target
- std::vector<cmSourceFile*>& classes = target.GetSourceFiles();
- for(std::vector<cmSourceFile*>::iterator i = classes.begin();
+ std::vector<cmSourceFile*> const& classes = target.GetSourceFiles();
+ for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
i != classes.end(); ++i)
{
if(!(*i)->GetPropertyAsBool("HEADER_FILE_ONLY") &&
@@ -706,7 +706,7 @@ void cmLocalGenerator::AddBuildTargetRule(const char* llang, cmTarget& target)
comment.c_str(),
this->Makefile->GetStartOutputDirectory()
);
- target.GetSourceFiles().push_back
+ target.AddSourceFile
(this->Makefile->GetSource(targetFullPath.c_str()));
}
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ac8d34b..c4417bb 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -454,7 +454,7 @@ void cmTarget::TraceVSDependencies(std::string projFile,
cmMakefile *makefile)
{
// get the classes from the source lists then add them to the groups
- std::vector<cmSourceFile*> & classes = this->GetSourceFiles();
+ std::vector<cmSourceFile*> & classes = this->SourceFiles;
// use a deck to keep track of processed source files
std::queue<std::string> srcFilesToProcess;
std::set<cmStdString> srcFilesQueued;
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 454c95d..97f574d 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -89,7 +89,9 @@ public:
/**
* Get the list of the source files used by this target
*/
- std::vector<cmSourceFile*> &GetSourceFiles() {return this->SourceFiles;}
+ std::vector<cmSourceFile*> const &GetSourceFiles()
+ {return this->SourceFiles;}
+ void AddSourceFile(cmSourceFile* sf) { this->SourceFiles.push_back(sf); }
/**
* Get the list of the source files used by this target