[cmake-commits] hoffman committed cmLocalVisualStudio6Generator.cxx 1.100.2.7 1.100.2.8

cmake-commits at cmake.org cmake-commits at cmake.org
Sat Mar 17 12:23:27 EST 2007


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

Modified Files:
      Tag: CMake-2-4
	cmLocalVisualStudio6Generator.cxx 
Log Message:
ENH: fix for crash from main tree


Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.100.2.7
retrieving revision 1.100.2.8
diff -u -d -r1.100.2.7 -r1.100.2.8
--- cmLocalVisualStudio6Generator.cxx	17 Mar 2007 17:18:33 -0000	1.100.2.7
+++ cmLocalVisualStudio6Generator.cxx	17 Mar 2007 17:23:25 -0000	1.100.2.8
@@ -422,15 +422,18 @@
       }
 
     const char* lang = this->GetSourceFileLanguage(*(*sf));
-    if(lang && strcmp(lang, "CXX") == 0)
-      {
-      // force a C++ file type
-      compileFlags += " /TP ";
-      }
-    else if(lang && strcmp(lang, "C") == 0)
+    if(lang)
       {
-      // force to c file type
-      compileFlags += " /TC ";
+      if(strcmp(lang, "CXX") == 0)
+        {
+        // force a C++ file type
+        compileFlags += " /TP ";
+        }
+      else if(strcmp(lang, "C") == 0)
+        {
+        // force to c file type
+        compileFlags += " /TC ";
+        }
       }
       
     // Check for extra object-file dependencies.



More information about the Cmake-commits mailing list