kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-10587-avoid-try-compile-warnings' 

984acc8 VS10: avoid warning, no nologo when verbose (#10587)
This commit is contained in:
Brad King 2010-12-21 14:00:27 -05:00 committed by CMake Topic Stage
parent 17025ebda1 984acc884b
commit b482ba3e38
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmVisualStudioGeneratorOptions.cxx
View File

@ -85,17 +85,15 @@ void cmVisualStudioGeneratorOptions::SetVerboseMakefile(bool verbose)
// was not given explicitly in the flags we want to add an attribute // was not given explicitly in the flags we want to add an attribute
// 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:
// "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())
{ {
if(this->Version == 10) this->FlagMap["SuppressStartupBanner"] = "FALSE";
{
this->FlagMap["SuppressStartupBanner"] = "false";
}
else
{
this->FlagMap["SuppressStartupBanner"] = "FALSE";
}
} }
} }