Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 33 additions & 4 deletions modules/vstudio/tests/vc2019/test_compile_settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -198,15 +198,15 @@
--

function suite.disableSpecificWarningsWithClang()
disablewarnings { "disable" }
disablewarnings { "warningID" }
toolset "clang"
prepare()
test.capture [[
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalOptions>-Wno-disable %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>-Wno-warningID %(AdditionalOptions)</AdditionalOptions>
]]
end

Expand All @@ -215,14 +215,43 @@
--

function suite.fatalSpecificWarningsWithClang()
fatalwarnings { "disable" }
fatalwarnings { "warningID" }
toolset "clang"
prepare()
test.capture [[
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalOptions>-Werror=disable %(AdditionalOptions)</AdditionalOptions>
<AdditionalOptions>-Werror=warningID %(AdditionalOptions)</AdditionalOptions>
]]
end

--
-- Enable specific warnings.
--

function suite.enableSpecificWarnings()
enablewarnings { "warningID" }
prepare()
test.capture [[
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalOptions>/w1warningID %(AdditionalOptions)</AdditionalOptions>
]]
end

function suite.enableSpecificWarningsWithClang()
enablewarnings { "warningID" }
toolset "clang"
prepare()
test.capture [[
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<AdditionalOptions>-WwarningID %(AdditionalOptions)</AdditionalOptions>
]]
end
2 changes: 2 additions & 0 deletions modules/vstudio/vs2010_vcxproj.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2150,6 +2150,7 @@
if cfg.toolset and cfg.toolset:startswith("msc") then
local value = iif(cfg.unsignedchar, "On", "Off")
table.insert(opts, p.tools.msc.shared.unsignedchar[value])
opts = table.join(opts, table.translate(cfg.enablewarnings, function(enable) return '/w1' .. enable end))
elseif _ACTION >= "vs2019" and cfg.toolset and cfg.toolset == "clang" then
local value = iif(cfg.unsignedchar, "On", "Off")
table.insert(opts, p.tools.msc.shared.unsignedchar[value])
Expand All @@ -2163,6 +2164,7 @@
end
opts = table.join(opts, table.translate(cfg.disablewarnings, function(disable) return '-Wno-' .. disable end))
opts = table.join(opts, table.translate(p.filterFatalWarnings(cfg.fatalwarnings), function(disable) return '-Werror=' .. disable end))
opts = table.join(opts, table.translate(cfg.enablewarnings, function(enable) return '-W' .. enable end))
end

if #opts > 0 then
Expand Down
Loading