AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

Merge pull request #2006 from Jarod42/externalwarnings_vs2019

Browse Source 
`externalwarnings`, `externalanglebrackets`, `externalincludedirs` was already available in vs2019
This commit is contained in:
Samuel Surtees 2022-12-11 17:12:08 +10:00 committed by GitHub
commit 2a3f3b75ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/vstudio/tests/vc2010/test_compile_settings.lua
View File

@ -1277,6 +1277,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<LanguageStandard>stdcpp14</LanguageStandard>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
</ClCompile>
]]
end
@ -1334,6 +1335,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<LanguageStandard>stdcpp17</LanguageStandard>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
</ClCompile>
]]
end
@ -1364,6 +1366,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<LanguageStandard>stdcpp20</LanguageStandard>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
</ClCompile>
]]
end
@ -1379,6 +1382,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<LanguageStandard_C>stdc11</LanguageStandard_C>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
</ClCompile>
]]
end
@ -1394,6 +1398,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<LanguageStandard_C>stdc17</LanguageStandard_C>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
</ClCompile>
]]
end
@ -1451,6 +1456,7 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<LanguageStandard>stdcpplatest</LanguageStandard>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
</ClCompile>
]]
end
@ -1711,6 +1717,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
</ClCompile>
]]
end

4
modules/vstudio/tests/vc2019/test_compile_settings.lua
View File

@ -91,6 +91,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
<ScanSourceForModuleDependencies>true</ScanSourceForModuleDependencies>
]]
end
@ -103,6 +104,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
<ScanSourceForModuleDependencies>false</ScanSourceForModuleDependencies>
]]
end
@ -115,6 +117,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
<UseStandardPreprocessor>true</UseStandardPreprocessor>
]]
end
@ -127,6 +130,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<ExternalWarningLevel>Level3</ExternalWarningLevel>
<UseStandardPreprocessor>false</UseStandardPreprocessor>
]]
end

8
modules/vstudio/vs2010_vcxproj.lua
View File

@ -2249,7 +2249,7 @@
function m.includePath(cfg)
local dirs = vstudio.path(cfg, cfg.externalincludedirs)
if #dirs > 0 then
if _ACTION < "vs2022" then
if _ACTION < "vs2019" then
m.element("IncludePath", nil, "%s;$(IncludePath)", table.concat(dirs, ";"))
else
m.element("ExternalIncludePath", nil, "%s;$(ExternalIncludePath)", table.concat(dirs, ";"))
@ -2965,7 +2965,7 @@
function m.externalWarningLevel(cfg)
if _ACTION >= "vs2022" then
if _ACTION >= "vs2019" then
local map = { Off = "TurnOffAllWarnings", High = "Level4", Extra = "Level4", Everything = "Level4" }
m.element("ExternalWarningLevel", nil, map[cfg.externalwarnings] or "Level3")
end
@ -2973,7 +2973,7 @@
function m.externalWarningLevelFile(cfg, condition)
if _ACTION >= "vs2022" then
if _ACTION >= "vs2019" then
if cfg.externalwarnings then
local map = { Off = "TurnOffAllWarnings", High = "Level4", Extra = "Level4", Everything = "Level4" }
m.element("ExternalWarningLevel", condition, map[cfg.externalwarnings] or "Level3")
@ -2983,7 +2983,7 @@
function m.externalAngleBrackets(cfg, condition)
if _ACTION >= "vs2022" then
if _ACTION >= "vs2019" then
if cfg.externalanglebrackets == p.OFF then
m.element("TreatAngleIncludeAsExternal", condition, "false")
elseif cfg.externalanglebrackets == p.ON then

2
src/tools/msc.lua
View File

@ -264,7 +264,7 @@
for _, dir in ipairs(extdirs or {}) do
dir = project.getrelative(cfg.project, dir)
if cfg.toolset and cfg.toolset >= "msc-v143" then
if cfg.toolset and cfg.toolset >= "msc-v142" then
table.insert(result, '/external:I' .. p.quoted(dir))
else
table.insert(result, '-I' .. p.quoted(dir))

2
website/docs/externalanglebrackets.md
View File

@ -20,7 +20,7 @@ Project configurations.
### Availability ###
Premake 5.0 or later.
Visual Studio 2022 version 17.0 or later.
Visual Studio 2019 version or later.
### See Also ###

2
website/docs/externalwarnings.md
View File

@ -25,7 +25,7 @@ Project configurations.
### Availability ###
Premake 5.0 or later.
Visual Studio 2022 version 17.0 or later.
Visual Studio 2019 version or later.
### Examples ###