Преглед изворни кода

BUG: fix crash with force cxx type

Bill Hoffman пре 22 година
родитељ
комит
d4d2779542
2 измењених фајлова са 10 додато и 2 уклоњено
  1. 5 1
      Source/cmLocalVisualStudio6Generator.cxx
  2. 5 1
      Source/cmLocalVisualStudio7Generator.cxx

+ 5 - 1
Source/cmLocalVisualStudio6Generator.cxx

@@ -293,7 +293,11 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
       if(cc->second.m_SourceFile)
       if(cc->second.m_SourceFile)
         {
         {
         // Check for extra compiler flags.
         // Check for extra compiler flags.
-        compileFlags = cc->second.m_SourceFile->GetProperty("COMPILE_FLAGS");
+        const char* cflags = cc->second.m_SourceFile->GetProperty("COMPILE_FLAGS");
+        if(cflags)
+          {
+          compileFlags = cflags;
+          }
         if(cmSystemTools::GetFileFormat(
         if(cmSystemTools::GetFileFormat(
              cc->second.m_SourceFile->GetSourceExtension().c_str())
              cc->second.m_SourceFile->GetSourceExtension().c_str())
            == cmSystemTools::CXX_FILE_FORMAT)
            == cmSystemTools::CXX_FILE_FORMAT)

+ 5 - 1
Source/cmLocalVisualStudio7Generator.cxx

@@ -729,7 +729,11 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
       if(cc->second.m_SourceFile)
       if(cc->second.m_SourceFile)
         {
         {
         // Check for extra compiler flags.
         // Check for extra compiler flags.
-        compileFlags = cc->second.m_SourceFile->GetProperty("COMPILE_FLAGS");
+        const char* cflags = cc->second.m_SourceFile->GetProperty("COMPILE_FLAGS");
+        if(cflags)
+          {
+          compileFlags = cc->second.m_SourceFile->GetProperty("COMPILE_FLAGS");
+          }
         if(cmSystemTools::GetFileFormat(
         if(cmSystemTools::GetFileFormat(
              cc->second.m_SourceFile->GetSourceExtension().c_str())
              cc->second.m_SourceFile->GetSourceExtension().c_str())
            == cmSystemTools::CXX_FILE_FORMAT)
            == cmSystemTools::CXX_FILE_FORMAT)