diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-08 14:07:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-08 14:07:08 (GMT) |
| commit | b61994d0a73df7d89373f1c3cc72610c655f9e56 (patch) | |
| tree | 77f2906c8fcdd98960ea5146090971b9d036a057 /Source | |
| parent | c2b88742891da193b74aa733bce1daafc24a1557 (diff) | |
| parent | f545eb0b0b00cb02f540636549f63189f43b4870 (diff) | |
| download | CMake-b61994d0a73df7d89373f1c3cc72610c655f9e56.zip CMake-b61994d0a73df7d89373f1c3cc72610c655f9e56.tar.gz CMake-b61994d0a73df7d89373f1c3cc72610c655f9e56.tar.bz2 | |
Merge topic 'vs-inherit-wd'
f545eb0b VS: Inherit target-level "-wd" flags in source files (#15284)
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
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, " ", ""); |