Browse Source

COMP: parent is not used anymore with this patch, since now the name is
given as a vector of components

Alex

Alexander Neundorf 18 years ago
parent
commit
f55dd81190
3 changed files with 6 additions and 10 deletions
  1. 3 5
      Source/cmMakefile.cxx
  2. 2 3
      Source/cmMakefile.h
  3. 1 2
      Source/cmSourceGroupCommand.cxx

+ 3 - 5
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;

+ 2 - 3
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
   

+ 1 - 2
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)
     {