[Cmake-commits] CMake branch, next, updated. v2.8.3-1015-gdea8cb3

[David Cole]

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  dea8cb35675b5af919fa2c1e4991584acbe5d5e0 (commit)
       via  984acc884ba4c21192712c20b7820d94ad855605 (commit)
      from  a0b5a1ab71a1d1bc1b4278c3c38471ab93fc41d9 (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=dea8cb35675b5af919fa2c1e4991584acbe5d5e0
commit dea8cb35675b5af919fa2c1e4991584acbe5d5e0
Merge: a0b5a1a 984acc8
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Dec 17 16:05:42 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 17 16:05:42 2010 -0500

    Merge topic 'fix-10587-avoid-try-compile-warnings' into next
    
    984acc8 VS10: avoid warning, no nologo when verbose (#10587)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=984acc884ba4c21192712c20b7820d94ad855605
commit 984acc884ba4c21192712c20b7820d94ad855605
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Dec 17 15:43:16 2010 -0500
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Dec 17 16:01:19 2010 -0500

    VS10: avoid warning, no nologo when verbose (#10587)
    
    For prior versions of Visual Studio we would intentionally pass
    "/nologo-" for "verbose makefiles" (CMAKE_VERBOSE_MAKEFILE ON)
    when the caller did not already explicitly specify either /nologo
    or /nologo-. And we still do. For the prior versions.
    
    This had the side effect of always passing /nologo- for try_compile
    operations because try_compile generates projects that have verbose
    makefiles on.
    
    However, starting with Visual Studio 10, the compiler emits
    "cl ... warning D9035: option 'nologo-' has been deprecated"
    when passed "/nologo-".
    
    Therefore, this commit removes setting "/nologo-" for verbose
    makefiles in the Visual Studio 10 case to avoid emitting a
    warning for every single invocation of the compiler in a given
    build.
    
    With Visual Studio 10, we do not set this flag either way
    and therefore, the generated project has no value for this
    setting and gets Visual Studio's default value, which is
    of course "/nologo", which does not produce a warning.
    
    With Visual Studio 10, a caller can still force "/nologo-"
    if desired by adding it explicitly to CMAKE_C_FLAGS or
    CMAKE_CXX_FLAGS.

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

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

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


hooks/post-receive
-- 
CMake