瀏覽代碼

Use C flags too. Not exactly the right solution but it will have to do for now.

Andy Cedilnik 23 年之前
父節點
當前提交
01151ab795
共有 1 個文件被更改,包括 11 次插入3 次删除
  1. 11 3
      Source/cmLocalVisualStudio6Generator.cxx

+ 11 - 3
Source/cmLocalVisualStudio6Generator.cxx

@@ -856,9 +856,17 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
       flags = m_Makefile->GetDefinition("CMAKE_CXX_FLAGS_RELWITHDEBINFO");
       flags += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\"";
       cmSystemTools::ReplaceString(line,"CMAKE_CXX_FLAGS_RELWITHDEBINFO", flags.c_str());
-      cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS",
-                                   m_Makefile->
-                                   GetDefinition("CMAKE_CXX_FLAGS"));
+      flags = "";
+      if ( m_Makefile->GetDefinition("CMAKE_C_FLAGS") )
+        {
+        flags += m_Makefile->GetDefinition("CMAKE_C_FLAGS");
+        }
+      if ( m_Makefile->GetDefinition("CMAKE_CXX_FLAGS") )
+        {
+        flags += m_Makefile->GetDefinition("CMAKE_CXX_FLAGS");
+        }
+
+      cmSystemTools::ReplaceString(line, "CMAKE_CXX_FLAGS", flags.c_str());
       }
     fout << line.c_str() << std::endl;
     }