diff options
| author | David Cole <david.cole@kitware.com> | 2011-10-18 19:02:38 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-10-18 19:02:38 (GMT) |
| commit | 56b153d3e5205c4eaa9ea82f26c7933f1107e955 (patch) | |
| tree | 4a46572b9c1f2536d0cc445fd0948dff00064f97 | |
| parent | 91e970ce5b6213328a4145583a7063661288880a (diff) | |
| parent | 25116a3cc21f252fe64ba074e3aeaa6335fc6624 (diff) | |
| download | CMake-56b153d3e5205c4eaa9ea82f26c7933f1107e955.zip CMake-56b153d3e5205c4eaa9ea82f26c7933f1107e955.tar.gz CMake-56b153d3e5205c4eaa9ea82f26c7933f1107e955.tar.bz2 | |
Merge topic 'vs10-nologo-issue-12504'
25116a3 Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files (#12504)
| -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" : ""; } } |