diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-21 19:00:27 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-21 19:00:27 (GMT) |
| commit | b482ba3e38bf8567f926cbcc9671079d1f2025b9 (patch) | |
| tree | 146e6ab3120c157d452de469b05c3e624173211f | |
| parent | 17025ebda1683d1dcd7d7119e151454e83a30cd7 (diff) | |
| parent | 984acc884ba4c21192712c20b7820d94ad855605 (diff) | |
| download | CMake-b482ba3e38bf8567f926cbcc9671079d1f2025b9.zip CMake-b482ba3e38bf8567f926cbcc9671079d1f2025b9.tar.gz CMake-b482ba3e38bf8567f926cbcc9671079d1f2025b9.tar.bz2 | |
Merge topic 'fix-10587-avoid-try-compile-warnings'
984acc8 VS10: avoid warning, no nologo when verbose (#10587)
| -rw-r--r-- | Source/cmVisualStudioGeneratorOptions.cxx | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index f1bad9c..9acae0d 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -85,17 +85,15 @@ void cmVisualStudioGeneratorOptions::SetVerboseMakefile(bool verbose) // was not given explicitly in the flags we want to add an attribute // 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: + // "cl ... warning D9035: option 'nologo-' has been deprecated" + // if(verbose && + this->Version != 10 && this->FlagMap.find("SuppressStartupBanner") == this->FlagMap.end()) { - if(this->Version == 10) - { - this->FlagMap["SuppressStartupBanner"] = "false"; - } - else - { - this->FlagMap["SuppressStartupBanner"] = "FALSE"; - } + this->FlagMap["SuppressStartupBanner"] = "FALSE"; } } |