[cmake-commits] alex committed cmMakefile.h 1.214 1.215 cmMakefile.cxx 1.412 1.413 cmSourceGroupCommand.cxx 1.18 1.19

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv12089

Modified Files:
	cmMakefile.h cmMakefile.cxx cmSourceGroupCommand.cxx 
Log Message:

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

Alex


Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -d -r1.214 -r1.215
--- cmMakefile.h	24 Aug 2007 18:21:49 -0000	1.214
+++ cmMakefile.h	26 Aug 2007 07:17:10 -0000	1.215
@@ -293,15 +293,14 @@
   /**
    * 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
   

Index: cmSourceGroupCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSourceGroupCommand.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cmSourceGroupCommand.cxx	24 Aug 2007 18:21:49 -0000	1.18
+++ cmSourceGroupCommand.cxx	26 Aug 2007 07:17:11 -0000	1.19
@@ -64,8 +64,7 @@
 
   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)
     {

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -d -r1.412 -r1.413
--- cmMakefile.cxx	24 Aug 2007 18:21:49 -0000	1.412
+++ cmMakefile.cxx	26 Aug 2007 07:17:10 -0000	1.413
@@ -1481,20 +1481,18 @@
 }
 
  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;