From f55dd81190ba172da1498677513d261715b5b647 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 26 Aug 2007 03:17:11 -0400 Subject: [PATCH] COMP: parent is not used anymore with this patch, since now the name is given as a vector of components Alex --- Source/cmMakefile.cxx | 8 +++----- Source/cmMakefile.h | 5 ++--- Source/cmSourceGroupCommand.cxx | 3 +-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 534ab02c2..24126f94d 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1481,20 +1481,18 @@ cmSourceGroup* cmMakefile::GetSourceGroup(const std::vector&name) } void cmMakefile::AddSourceGroup(const char* name, - const char* regex, - const char* parent) + const char* regex) { if (name) { std::vector nameVector; nameVector.push_back(name); - AddSourceGroup(nameVector, regex, parent); + AddSourceGroup(nameVector, regex); } } void cmMakefile::AddSourceGroup(const std::vector& name, - const char* regex, - const char *parent) + const char* regex) { cmSourceGroup* sg = 0; std::vector currentName; diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index d2cd1d2ec..7915f0862 100644 --- a/Source/cmMakefile.h +++ b/Source/cmMakefile.h @@ -293,15 +293,14 @@ public: /** * Add a root source group for consideration when adding a new source. */ - void AddSourceGroup(const char* name, const char* regex=0, - const char* parent=0); + void AddSourceGroup(const char* name, const char* regex=0); /** * Add a source group for consideration when adding a new source. * name is tokenized. */ void AddSourceGroup(const std::vector& name, - const char* regex=0, const char* parent=0); + const char* regex=0); #endif diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx index 145b7ede2..97385c9ac 100644 --- a/Source/cmSourceGroupCommand.cxx +++ b/Source/cmSourceGroupCommand.cxx @@ -64,8 +64,7 @@ bool cmSourceGroupCommand::InitialPass(std::vector const& args) std::vector folders = tokenize(args[0], delimiter); - const char *parent = NULL; - cmSourceGroup* sg = NULL; + cmSourceGroup* sg = 0; sg = this->Makefile->GetSourceGroup(folders); if(!sg) {