瀏覽代碼

Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files (#12504)

Niels Dekker 14 年之前
父節點
當前提交
25116a3cc2
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Source/cmVisualStudioGeneratorOptions.cxx

+ 3 - 3
Source/cmVisualStudioGeneratorOptions.cxx

@@ -86,14 +86,14 @@ void cmVisualStudioGeneratorOptions::SetVerboseMakefile(bool verbose)
   // to the generated project to disable logo suppression.  Otherwise
   // to the generated project to disable logo suppression.  Otherwise
   // the GUI default is to enable suppression.
   // the GUI default is to enable suppression.
   //
   //
-  // Avoid this on Visual Studio 10 (and later!) because it results in:
+  // On Visual Studio 10 (and later!), the value of this attribute should be
+  // an empty string, instead of "FALSE", in order to avoid a warning:
   //   "cl ... warning D9035: option 'nologo-' has been deprecated"
   //   "cl ... warning D9035: option 'nologo-' has been deprecated"
   //
   //
   if(verbose &&
   if(verbose &&
-     this->Version != 10 &&
      this->FlagMap.find("SuppressStartupBanner") == this->FlagMap.end())
      this->FlagMap.find("SuppressStartupBanner") == this->FlagMap.end())
     {
     {
-    this->FlagMap["SuppressStartupBanner"] = "FALSE";
+    this->FlagMap["SuppressStartupBanner"] = this->Version < 10 ? "FALSE" : "";
     }
     }
 }
 }