浏览代码

ENH: also support nmake and msvc for use with CodeBlocks under Windows,
patch by Daniel Teske

Alex

Alexander Neundorf 16 年之前
父节点
当前提交
42270c86b0
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Source/cmExtraCodeBlocksGenerator.cxx

+ 2 - 2
Source/cmExtraCodeBlocksGenerator.cxx

@@ -61,8 +61,8 @@ cmExtraCodeBlocksGenerator::cmExtraCodeBlocksGenerator()
 {
 {
 #if defined(_WIN32)
 #if defined(_WIN32)
   this->SupportedGlobalGenerators.push_back("MinGW Makefiles");
   this->SupportedGlobalGenerators.push_back("MinGW Makefiles");
+  this->SupportedGlobalGenerators.push_back("NMake Makefiles");
 // disable until somebody actually tests it:
 // disable until somebody actually tests it:
-//  this->SupportedGlobalGenerators.push_back("NMake Makefiles");
 //  this->SupportedGlobalGenerators.push_back("MSYS Makefiles");
 //  this->SupportedGlobalGenerators.push_back("MSYS Makefiles");
 #endif
 #endif
   this->SupportedGlobalGenerators.push_back("Unix Makefiles");
   this->SupportedGlobalGenerators.push_back("Unix Makefiles");
@@ -428,7 +428,7 @@ std::string cmExtraCodeBlocksGenerator::GetCBCompilerId(const cmMakefile* mf)
   std::string compiler = "gcc";
   std::string compiler = "gcc";
   if (compilerId == "MSVC")
   if (compilerId == "MSVC")
     {
     {
-    compiler = "msvc";
+    compiler = "msvc8";
     }
     }
   else if (compilerId == "Borland")
   else if (compilerId == "Borland")
     {
     {