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

COMP: parent is not used anymore with this patch, since now the name is 

given as a vector of components

Alex
This commit is contained in:
Alexander Neundorf 2007-08-26 03:17:11 -04:00
parent 1410eef27a
commit f55dd81190
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmMakefile.cxx
View File

@ -1481,20 +1481,18 @@ cmSourceGroup* cmMakefile::GetSourceGroup(const std::vector<std::string>&name)
} }
void cmMakefile::AddSourceGroup(const char* name, void cmMakefile::AddSourceGroup(const char* name,
const char* regex, const char* regex)
const char* parent)
{ {
if (name) if (name)
{ {
std::vector<std::string> nameVector; std::vector<std::string> nameVector;
nameVector.push_back(name); nameVector.push_back(name);
AddSourceGroup(nameVector, regex, parent); AddSourceGroup(nameVector, regex);
} }
} }
void cmMakefile::AddSourceGroup(const std::vector<std::string>& name, void cmMakefile::AddSourceGroup(const std::vector<std::string>& name,
const char* regex, const char* regex)
const char *parent)
{ {
cmSourceGroup* sg = 0; cmSourceGroup* sg = 0;
std::vector<std::string> currentName; std::vector<std::string> currentName;

5
Source/cmMakefile.h
View File

@ -293,15 +293,14 @@ public:
/** /**
* Add a root source group for consideration when adding a new source. * Add a root source group for consideration when adding a new source.
*/ */
void AddSourceGroup(const char* name, const char* regex=0, void AddSourceGroup(const char* name, const char* regex=0);
const char* parent=0);
/** /**
* Add a source group for consideration when adding a new source. * Add a source group for consideration when adding a new source.
* name is tokenized. * name is tokenized.
*/ */
void AddSourceGroup(const std::vector<std::string>& name, void AddSourceGroup(const std::vector<std::string>& name,
const char* regex=0, const char* parent=0); const char* regex=0);
#endif #endif

3
Source/cmSourceGroupCommand.cxx
View File

@ -64,8 +64,7 @@ bool cmSourceGroupCommand::InitialPass(std::vector<std::string> const& args)
std::vector<std::string> folders = tokenize(args[0], delimiter); std::vector<std::string> folders = tokenize(args[0], delimiter);
const char *parent = NULL; cmSourceGroup* sg = 0;
cmSourceGroup* sg = NULL;
sg = this->Makefile->GetSourceGroup(folders); sg = this->Makefile->GetSourceGroup(folders);
if(!sg) if(!sg)
{ {