diff options
| author | Niels Dekker <niels-xtk@xs4all.nl> | 2011-10-11 20:48:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-10-11 21:07:53 (GMT) |
| commit | 25116a3cc21f252fe64ba074e3aeaa6335fc6624 (patch) | |
| tree | 0efacc17b468290a6a23377e6f66d426e28a7c59 /Source/cmVisualStudioGeneratorOptions.cxx | |
| parent | 12264045453f53aa9ca3defb350842c8b0b3c30c (diff) | |
| download | CMake-25116a3cc21f252fe64ba074e3aeaa6335fc6624.zip CMake-25116a3cc21f252fe64ba074e3aeaa6335fc6624.tar.gz CMake-25116a3cc21f252fe64ba074e3aeaa6335fc6624.tar.bz2 | |
Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files (#12504)
Diffstat (limited to 'Source/cmVisualStudioGeneratorOptions.cxx')
| -rw-r--r-- | Source/cmVisualStudioGeneratorOptions.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx index ae496ad..4edeedc 100644 --- a/Source/cmVisualStudioGeneratorOptions.cxx +++ b/Source/cmVisualStudioGeneratorOptions.cxx @@ -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" : ""; } } |