[cmake-commits] king committed cmLocalVisualStudio6Generator.cxx 1.127 1.127.2.1 cmLocalVisualStudio7Generator.cxx 1.194.2.1 1.194.2.2 cmLocalVisualStudioGenerator.cxx 1.11 1.11.4.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-SourceFile2-b
	cmLocalVisualStudio6Generator.cxx 
	cmLocalVisualStudio7Generator.cxx 
	cmLocalVisualStudioGenerator.cxx 
Log Message:
COMP: Fix for new cmSourceFile interface.


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.194.2.1
retrieving revision 1.194.2.2
diff -u -d -r1.194.2.1 -r1.194.2.2
--- cmLocalVisualStudio7Generator.cxx	11 Jun 2007 22:23:34 -0000	1.194.2.1
+++ cmLocalVisualStudio7Generator.cxx	13 Jun 2007 17:44:38 -0000	1.194.2.2
@@ -883,10 +883,11 @@
   for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
       i != classes.end(); i++)
     {
-    if(cmSystemTools::UpperCase((*i)->GetSourceExtension()) == "DEF")
+    cmSourceFile* sf = *i;
+    if(cmSystemTools::UpperCase(sf->GetExtension()) == "DEF")
       {
       fout << "\t\t\t\tModuleDefinitionFile=\""
-           << this->ConvertToXMLOutputPath((*i)->GetFullPath().c_str())
+           << this->ConvertToXMLOutputPath(sf->GetFullPath())
            << "\"\n";
       return;
       }
@@ -969,7 +970,7 @@
     {
     // Add the file to the list of sources.
     std::string source = (*i)->GetFullPath();
-    if(cmSystemTools::UpperCase((*i)->GetSourceExtension()) == "DEF")
+    if(cmSystemTools::UpperCase((*i)->GetExtension()) == "DEF")
       {
       this->ModuleDefinitionFile = (*i)->GetFullPath();
       }
@@ -1070,8 +1071,9 @@
       compileFlags += " ";
       compileFlags += cflags;
       }
-    const char* lang = this->GlobalGenerator->GetLanguageFromExtension
-      ((*sf)->GetSourceExtension().c_str());
+    const char* lang =
+      this->GlobalGenerator->GetLanguageFromExtension
+      ((*sf)->GetExtension().c_str());
     const char* sourceLang = this->GetSourceFileLanguage(*(*sf));
     const char* linkLanguage = target.GetLinkerLanguage
       (this->GetGlobalGenerator());
@@ -1138,7 +1140,7 @@
               || objectName.size() || excludedFromBuild)
         {
         const char* aCompilerTool = "VCCLCompilerTool";
-        std::string ext = (*sf)->GetSourceExtension();
+        std::string ext = (*sf)->GetExtension();
         ext = cmSystemTools::LowerCase(ext);
         if(ext == "idl")
           {

Index: cmLocalVisualStudioGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudioGenerator.cxx,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -u -d -r1.11 -r1.11.4.1
--- cmLocalVisualStudioGenerator.cxx	9 May 2007 12:25:45 -0000	1.11
+++ cmLocalVisualStudioGenerator.cxx	13 Jun 2007 17:44:39 -0000	1.11.4.1
@@ -73,7 +73,7 @@
         std::string objectName =
           cmSystemTools::LowerCase(
             cmSystemTools::GetFilenameWithoutLastExtension(
-              sf->GetFullPath().c_str()));
+              sf->GetFullPath()));
         objectName += ".obj";
         objectNameCounts[objectName] += 1;
         }
@@ -95,7 +95,7 @@
         std::string objectName =
           cmSystemTools::LowerCase(
             cmSystemTools::GetFilenameWithoutLastExtension(
-              sf->GetFullPath().c_str()));
+              sf->GetFullPath()));
         objectName += ".obj";
         if(objectNameCounts[objectName] > 1)
           {

Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.127
retrieving revision 1.127.2.1
diff -u -d -r1.127 -r1.127.2.1
--- cmLocalVisualStudio6Generator.cxx	28 May 2007 15:00:26 -0000	1.127
+++ cmLocalVisualStudio6Generator.cxx	13 Jun 2007 17:44:38 -0000	1.127.2.1
@@ -323,7 +323,7 @@
     sourceGroup.AssignSource(*i);
     // while we are at it, if it is a .rule file then for visual studio 6 we
     // must generate it
-    if ((*i)->GetSourceExtension() == "rule")
+    if ((*i)->GetExtension() == "rule")
       {
       if(!cmSystemTools::FileExists(source.c_str()))
         {