Merge topic 'vs10-nologo-issue-12504'

25116a3 Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files (#12504)
This commit is contained in:
David Cole 2011-10-18 15:02:38 -04:00 committed by CMake Topic Stage
commit 56b153d3e5
1 changed files with 3 additions and 3 deletions

View File

@ -86,14 +86,14 @@ void cmVisualStudioGeneratorOptions::SetVerboseMakefile(bool verbose)
// to the generated project to disable logo suppression. Otherwise
// 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"
//
if(verbose &&
this->Version != 10 &&
this->FlagMap.find("SuppressStartupBanner") == this->FlagMap.end())
{
this->FlagMap["SuppressStartupBanner"] = "FALSE";
this->FlagMap["SuppressStartupBanner"] = this->Version < 10 ? "FALSE" : "";
}
}