Commit e1e7b8ad authored by John Biddiscombe's avatar John Biddiscombe
Browse files

ENH: Added RemoveSource(...) to complement AddSource. New command

SOURCE_FILES_REMOVE uses it and can be used to take files out of the build
parent 6bf0be8e
......@@ -164,17 +164,17 @@ void cmMakefile::Print() const
{
// print the class lists
std::cout << "classes:\n";
for(SourceMap::const_iterator l = m_Sources.begin();
for(SourceMap::const_iterator l = m_Sources.begin();
l != m_Sources.end(); l++)
{
std::cout << " Class list named: " << l->first << std::endl;
for(std::vector<cmSourceFile>::const_iterator i = l->second.begin();
for(std::vector<cmSourceFile>::const_iterator i = l->second.begin();
i != l->second.end(); i++)
{
i->Print();
}
}
std::cout << " m_Targets: ";
for (cmTargets::const_iterator l = m_Targets.begin();
l != m_Targets.end(); l++)
......@@ -413,6 +413,27 @@ void cmMakefile::AddSource(cmSourceFile& cmfile, const char *srclist)
m_Sources[srclist].push_back(cmfile);
}
struct FindSrcByName : std::binary_function<cmSourceFile, cmSourceFile, bool>
{
public:
bool operator () (const cmSourceFile &f, const cmSourceFile &test) const
{
return !stricmp(f.GetSourceName().c_str(),test.GetSourceName().c_str());
}
};
void cmMakefile::RemoveSource(cmSourceFile& cmfile,const char *srclist)
{
std::vector<cmSourceFile> &maplist = m_Sources[srclist];
std::vector<cmSourceFile>::iterator f =
std::find_if(maplist.begin(), maplist.end(), std::bind2nd(FindSrcByName(),cmfile));
// std::vector<cmSourceFile>::iterator f = find_if(maplist.begin(), maplist.end(), matches(srclist);
if (f!=maplist.end())
{
maplist.erase(f);
}
}
void cmMakefile::AddCustomCommand(const char* source,
const char* command,
const char* commandArgs,
......
......@@ -232,6 +232,11 @@ public:
*/
void AddSource(cmSourceFile& ,const char *srcListName);
/**
* Remove a class/source file from the build.
*/
void RemoveSource(cmSourceFile& ,const char *srcListName);
/**
* Add a source group for consideration when adding a new source.
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment