Преглед на файлове

COMP: Fix build for windows-only generators after change to GetSourceFiles signature.

Brad King преди 18 години
родител
ревизия
27a0677d3e
променени са 3 файла, в които са добавени 8 реда и са изтрити 8 реда
  1. 1 1
      Source/cmGlobalVisualStudio8Generator.cxx
  2. 4 4
      Source/cmLocalVisualStudio6Generator.cxx
  3. 3 3
      Source/cmLocalVisualStudio7Generator.cxx

+ 1 - 1
Source/cmGlobalVisualStudio8Generator.cxx

@@ -153,7 +153,7 @@ void cmGlobalVisualStudio8Generator::Generate()
         if(cmSourceFile* file = mf->GetSource(CMAKE_CHECK_BUILD_SYSTEM_TARGET 
         if(cmSourceFile* file = mf->GetSource(CMAKE_CHECK_BUILD_SYSTEM_TARGET 
                                               ".vcproj.cmake.rule"))
                                               ".vcproj.cmake.rule"))
           {
           {
-          tgt->GetSourceFiles().push_back(file);
+          tgt->AddSourceFile(file);
           }
           }
         else
         else
           {
           {

+ 4 - 4
Source/cmLocalVisualStudio6Generator.cxx

@@ -244,7 +244,7 @@ void cmLocalVisualStudio6Generator::AddDSPBuildRule(cmTarget& tgt)
                                            no_working_directory, true);
                                            no_working_directory, true);
   if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
   if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
     {
     {
-    tgt.GetSourceFiles().push_back(file);
+    tgt.AddSourceFile(file);
     }
     }
   else
   else
     {
     {
@@ -309,11 +309,11 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
   
   
   // get the classes from the source lists then add them to the groups
   // 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 all of the source files have been properly assigned to the target
   // now stick them into source groups using the reg expressions
   // 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++)
       i != classes.end(); i++)
     {
     {
     // Add the file to the list of sources.
     // Add the file to the list of sources.
@@ -564,7 +564,7 @@ cmLocalVisualStudio6Generator
 
 
   // Add a source file representing this output to the project.
   // Add a source file representing this output to the project.
   cmSourceFile* outsf = this->Makefile->GetSourceFileWithOutput(output);
   cmSourceFile* outsf = this->Makefile->GetSourceFileWithOutput(output);
-  target.GetSourceFiles().push_back(outsf);
+  target.AddSourceFile(outsf);
 
 
   // Free the fake output name.
   // Free the fake output name.
   delete [] output;
   delete [] output;

+ 3 - 3
Source/cmLocalVisualStudio7Generator.cxx

@@ -88,7 +88,7 @@ void cmLocalVisualStudio7Generator::FixGlobalTargets()
       if(cmSourceFile* file =
       if(cmSourceFile* file =
          this->Makefile->GetSourceFileWithOutput(force.c_str()))
          this->Makefile->GetSourceFileWithOutput(force.c_str()))
         {
         {
-        tgt.GetSourceFiles().push_back(file);
+        tgt.AddSourceFile(file);
         }
         }
       }
       }
     }
     }
@@ -219,7 +219,7 @@ void cmLocalVisualStudio7Generator::AddVCProjBuildRule(cmTarget& tgt)
                                            no_working_directory, true);
                                            no_working_directory, true);
   if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
   if(cmSourceFile* file = this->Makefile->GetSource(makefileIn.c_str()))
     {
     {
-    tgt.GetSourceFiles().push_back(file);
+    tgt.AddSourceFile(file);
     }
     }
   else
   else
     {
     {
@@ -963,7 +963,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
   std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
 
 
   // get the classes from the source lists then add them to the groups
   // 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();
   for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
       i != classes.end(); i++)
       i != classes.end(); i++)
     {
     {