[cmake-commits] king committed cmGlobalVisualStudio8Generator.cxx 1.20 1.21 cmLocalVisualStudio6Generator.cxx 1.126 1.127 cmLocalVisualStudio7Generator.cxx 1.193 1.194

cmake-commits at cmake.org cmake-commits at cmake.org
Mon May 28 11:00:28 EDT 2007


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

Modified Files:
	cmGlobalVisualStudio8Generator.cxx 
	cmLocalVisualStudio6Generator.cxx 
	cmLocalVisualStudio7Generator.cxx 
Log Message:
COMP: Fix build for windows-only generators after change to GetSourceFiles signature.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -d -r1.193 -r1.194
--- cmLocalVisualStudio7Generator.cxx	24 May 2007 12:43:31 -0000	1.193
+++ cmLocalVisualStudio7Generator.cxx	28 May 2007 15:00:26 -0000	1.194
@@ -88,7 +88,7 @@
       if(cmSourceFile* file =
          this->Makefile->GetSourceFileWithOutput(force.c_str()))
         {
-        tgt.GetSourceFiles().push_back(file);
+        tgt.AddSourceFile(file);
         }
       }
     }
@@ -219,7 +219,7 @@
                                            no_working_directory, true);
   if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
     {
-    tgt.GetSourceFiles().push_back(file);
+    tgt.AddSourceFile(file);
     }
   else
     {
@@ -963,7 +963,7 @@
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
   // get the classes from the source lists then add them to the groups
-  std::vector<cmSourceFile*> & classes = target.GetSourceFiles();
+  std::vector<cmSourceFile*>const & classes = target.GetSourceFiles();
   for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
       i != classes.end(); i++)
     {

Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- cmLocalVisualStudio6Generator.cxx	24 May 2007 12:43:31 -0000	1.126
+++ cmLocalVisualStudio6Generator.cxx	28 May 2007 15:00:26 -0000	1.127
@@ -244,7 +244,7 @@
                                            no_working_directory, true);
   if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
     {
-    tgt.GetSourceFiles().push_back(file);
+    tgt.AddSourceFile(file);
     }
   else
     {
@@ -309,11 +309,11 @@
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
   
   // get the classes from the source lists then add them to the groups
-  std::vector<cmSourceFile*> & classes = target.GetSourceFiles();
+  std::vector<cmSourceFile*> const & classes = target.GetSourceFiles();
 
   // now all of the source files have been properly assigned to the target
   // now stick them into source groups using the reg expressions
-  for(std::vector<cmSourceFile*>::iterator i = classes.begin(); 
+  for(std::vector<cmSourceFile*>::const_iterator i = classes.begin(); 
       i != classes.end(); i++)
     {
     // Add the file to the list of sources.
@@ -564,7 +564,7 @@
 
   // Add a source file representing this output to the project.
   cmSourceFile* outsf = this->Makefile->GetSourceFileWithOutput(output);
-  target.GetSourceFiles().push_back(outsf);
+  target.AddSourceFile(outsf);
 
   // Free the fake output name.
   delete [] output;

Index: cmGlobalVisualStudio8Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.cxx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- cmGlobalVisualStudio8Generator.cxx	22 May 2007 14:24:59 -0000	1.20
+++ cmGlobalVisualStudio8Generator.cxx	28 May 2007 15:00:26 -0000	1.21
@@ -153,7 +153,7 @@
         if(cmSourceFile* file = mf->GetSource(CMAKE_CHECK_BUILD_SYSTEM_TARGET 
                                               ".vcproj.cmake.rule"))
           {
-          tgt->GetSourceFiles().push_back(file);
+          tgt->AddSourceFile(file);
           }
         else
           {



More information about the Cmake-commits mailing list