diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-26 07:17:11 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-26 07:17:11 (GMT) |
| commit | f55dd81190ba172da1498677513d261715b5b647 (patch) | |
| tree | 10b5ecc2f798e1d5595640beba0f4adab16ca336 | |
| parent | 1410eef27a2634ec1d2a0c57a66fd783133cfbf8 (diff) | |
| download | CMake-f55dd81190ba172da1498677513d261715b5b647.zip CMake-f55dd81190ba172da1498677513d261715b5b647.tar.gz CMake-f55dd81190ba172da1498677513d261715b5b647.tar.bz2 | |
COMP: parent is not used anymore with this patch, since now the name is
given as a vector of components
Alex
| -rw-r--r-- | Source/cmMakefile.cxx | 8 | ||||
| -rw-r--r-- | Source/cmMakefile.h | 5 | ||||
| -rw-r--r-- | Source/cmSourceGroupCommand.cxx | 3 |
3 files changed, 6 insertions, 10 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 534ab02..24126f9 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -1481,20 +1481,18 @@ cmSourceGroup* cmMakefile::GetSourceGroup(const std::vector<std::string>&name) } void cmMakefile::AddSourceGroup(const char* name, - const char* regex, - const char* parent) + const char* regex) { if (name) { std::vector<std::string> nameVector; nameVector.push_back(name); - AddSourceGroup(nameVector, regex, parent); + AddSourceGroup(nameVector, regex); } } void cmMakefile::AddSourceGroup(const std::vector<std::string>& name, - const char* regex, - const char *parent) + const char* regex) { cmSourceGroup* sg = 0; std::vector<std::string> currentName; diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h index d2cd1d2..7915f08 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<std::string>& 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 145b7ed..97385c9 100644 --- a/Source/cmSourceGroupCommand.cxx +++ b/Source/cmSourceGroupCommand.cxx @@ -64,8 +64,7 @@ bool cmSourceGroupCommand::InitialPass(std::vector<std::string> const& args) std::vector<std::string> folders = tokenize(args[0], delimiter); - const char *parent = NULL; - cmSourceGroup* sg = NULL; + cmSourceGroup* sg = 0; sg = this->Makefile->GetSourceGroup(folders); if(!sg) { |