[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1102-gcdcb218

[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  cdcb21844397efd56862fd4fad67f4b4d8045f6b (commit)
       via  f545eb0b0b00cb02f540636549f63189f43b4870 (commit)
      from  264d65529e0487d0af19fad578a92a28d18e770b (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=cdcb21844397efd56862fd4fad67f4b4d8045f6b
commit cdcb21844397efd56862fd4fad67f4b4d8045f6b
Merge: 264d655 f545eb0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 4 15:41:33 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 4 15:41:33 2014 -0500

    Merge topic 'vs-inherit-wd' into next
    
    f545eb0b VS: Inherit target-level "-wd" flags in source files (#15284)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f545eb0b0b00cb02f540636549f63189f43b4870
commit f545eb0b0b00cb02f540636549f63189f43b4870
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 4 15:32:32 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 4 15:40:04 2014 -0500

    VS: Inherit target-level "-wd" flags in source files (#15284)
    
    If a source file COMPILE_FLAGS option adds "-wd", the .vcxproj file
    will have a DisableSpecificWarnings setting for the source file.
    Add to the setting a reference to %(DisableSpecificWarnings) to
    inherit any such flags set for the whole target.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 68b6576..f903bdb 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1637,6 +1637,11 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
         clOptions.AppendFlag("AdditionalIncludeDirectories",
                              "%(AdditionalIncludeDirectories)");
         }
+      if(clOptions.HasFlag("DisableSpecificWarnings"))
+        {
+        clOptions.AppendFlag("DisableSpecificWarnings",
+                             "%(DisableSpecificWarnings)");
+        }
       clOptions.AddDefines(configDefines.c_str());
       clOptions.SetConfiguration((*config).c_str());
       clOptions.OutputAdditionalOptions(*this->BuildFileStream, "      ", "");

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake