[Cmake-commits] CMake branch, next, updated. v2.8.6-1563-ga34b8e7

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a34b8e73704df3451e902c9ae7fb3da75e50c7fa (commit)
       via  25116a3cc21f252fe64ba074e3aeaa6335fc6624 (commit)
      from  9b32d726ef9e064127bebd692e66e7a7a5096757 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a34b8e73704df3451e902c9ae7fb3da75e50c7fa
commit a34b8e73704df3451e902c9ae7fb3da75e50c7fa
Merge: 9b32d72 25116a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 11 17:48:52 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 11 17:48:52 2011 -0400

    Merge topic 'vs10-nologo-issue-12504' into next
    
    25116a3 Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files (#12504)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=25116a3cc21f252fe64ba074e3aeaa6335fc6624
commit 25116a3cc21f252fe64ba074e3aeaa6335fc6624
Author:     Niels Dekker <niels-xtk at xs4all.nl>
AuthorDate: Tue Oct 11 22:48:41 2011 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 11 17:07:53 2011 -0400

    Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files (#12504)

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" : "";
     }
 }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudioGeneratorOptions.cxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake