kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'vs-inherit-wd' 

f545eb0b VS: Inherit target-level "-wd" flags in source files (#15284)
This commit is contained in:
Brad King 2014-12-08 09:07:08 -05:00 committed by CMake Topic Stage
parent c2b8874289 f545eb0b0b
commit b61994d0a7
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -1637,6 +1637,11 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags(
clOptions.AppendFlag("AdditionalIncludeDirectories", clOptions.AppendFlag("AdditionalIncludeDirectories",
"%(AdditionalIncludeDirectories)"); "%(AdditionalIncludeDirectories)");
} }
if(clOptions.HasFlag("DisableSpecificWarnings"))
{
clOptions.AppendFlag("DisableSpecificWarnings",
"%(DisableSpecificWarnings)");
}
clOptions.AddDefines(configDefines.c_str()); clOptions.AddDefines(configDefines.c_str());
clOptions.SetConfiguration((*config).c_str()); clOptions.SetConfiguration((*config).c_str());
clOptions.OutputAdditionalOptions(*this->BuildFileStream, " ", ""); clOptions.OutputAdditionalOptions(*this->BuildFileStream, " ", "");