externalwarnings
, externalanglebrackets
, externalincludedirs
was already available in vs2019
This commit is contained in:
parent
1046b37b9d
commit
998cbc7a69
@ -1277,6 +1277,7 @@
|
|||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<LanguageStandard>stdcpp14</LanguageStandard>
|
<LanguageStandard>stdcpp14</LanguageStandard>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
@ -1334,6 +1335,7 @@
|
|||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
@ -1364,6 +1366,7 @@
|
|||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<LanguageStandard>stdcpp20</LanguageStandard>
|
<LanguageStandard>stdcpp20</LanguageStandard>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
@ -1379,6 +1382,7 @@
|
|||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<LanguageStandard_C>stdc11</LanguageStandard_C>
|
<LanguageStandard_C>stdc11</LanguageStandard_C>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
@ -1394,6 +1398,7 @@
|
|||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<LanguageStandard_C>stdc17</LanguageStandard_C>
|
<LanguageStandard_C>stdc17</LanguageStandard_C>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
@ -1451,6 +1456,7 @@
|
|||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
<LanguageStandard>stdcpplatest</LanguageStandard>
|
<LanguageStandard>stdcpplatest</LanguageStandard>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
@ -1711,6 +1717,7 @@
|
|||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
|
@ -91,6 +91,7 @@
|
|||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
<ScanSourceForModuleDependencies>true</ScanSourceForModuleDependencies>
|
<ScanSourceForModuleDependencies>true</ScanSourceForModuleDependencies>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
@ -103,6 +104,7 @@
|
|||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
<ScanSourceForModuleDependencies>false</ScanSourceForModuleDependencies>
|
<ScanSourceForModuleDependencies>false</ScanSourceForModuleDependencies>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
@ -115,6 +117,7 @@
|
|||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
<UseStandardPreprocessor>true</UseStandardPreprocessor>
|
<UseStandardPreprocessor>true</UseStandardPreprocessor>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
@ -127,6 +130,7 @@
|
|||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
<Optimization>Disabled</Optimization>
|
<Optimization>Disabled</Optimization>
|
||||||
|
<ExternalWarningLevel>Level3</ExternalWarningLevel>
|
||||||
<UseStandardPreprocessor>false</UseStandardPreprocessor>
|
<UseStandardPreprocessor>false</UseStandardPreprocessor>
|
||||||
]]
|
]]
|
||||||
end
|
end
|
||||||
|
@ -2249,7 +2249,7 @@
|
|||||||
function m.includePath(cfg)
|
function m.includePath(cfg)
|
||||||
local dirs = vstudio.path(cfg, cfg.externalincludedirs)
|
local dirs = vstudio.path(cfg, cfg.externalincludedirs)
|
||||||
if #dirs > 0 then
|
if #dirs > 0 then
|
||||||
if _ACTION < "vs2022" then
|
if _ACTION < "vs2019" then
|
||||||
m.element("IncludePath", nil, "%s;$(IncludePath)", table.concat(dirs, ";"))
|
m.element("IncludePath", nil, "%s;$(IncludePath)", table.concat(dirs, ";"))
|
||||||
else
|
else
|
||||||
m.element("ExternalIncludePath", nil, "%s;$(ExternalIncludePath)", table.concat(dirs, ";"))
|
m.element("ExternalIncludePath", nil, "%s;$(ExternalIncludePath)", table.concat(dirs, ";"))
|
||||||
@ -2965,7 +2965,7 @@
|
|||||||
|
|
||||||
|
|
||||||
function m.externalWarningLevel(cfg)
|
function m.externalWarningLevel(cfg)
|
||||||
if _ACTION >= "vs2022" then
|
if _ACTION >= "vs2019" then
|
||||||
local map = { Off = "TurnOffAllWarnings", High = "Level4", Extra = "Level4", Everything = "Level4" }
|
local map = { Off = "TurnOffAllWarnings", High = "Level4", Extra = "Level4", Everything = "Level4" }
|
||||||
m.element("ExternalWarningLevel", nil, map[cfg.externalwarnings] or "Level3")
|
m.element("ExternalWarningLevel", nil, map[cfg.externalwarnings] or "Level3")
|
||||||
end
|
end
|
||||||
@ -2973,7 +2973,7 @@
|
|||||||
|
|
||||||
|
|
||||||
function m.externalWarningLevelFile(cfg, condition)
|
function m.externalWarningLevelFile(cfg, condition)
|
||||||
if _ACTION >= "vs2022" then
|
if _ACTION >= "vs2019" then
|
||||||
if cfg.externalwarnings then
|
if cfg.externalwarnings then
|
||||||
local map = { Off = "TurnOffAllWarnings", High = "Level4", Extra = "Level4", Everything = "Level4" }
|
local map = { Off = "TurnOffAllWarnings", High = "Level4", Extra = "Level4", Everything = "Level4" }
|
||||||
m.element("ExternalWarningLevel", condition, map[cfg.externalwarnings] or "Level3")
|
m.element("ExternalWarningLevel", condition, map[cfg.externalwarnings] or "Level3")
|
||||||
@ -2983,7 +2983,7 @@
|
|||||||
|
|
||||||
|
|
||||||
function m.externalAngleBrackets(cfg, condition)
|
function m.externalAngleBrackets(cfg, condition)
|
||||||
if _ACTION >= "vs2022" then
|
if _ACTION >= "vs2019" then
|
||||||
if cfg.externalanglebrackets == p.OFF then
|
if cfg.externalanglebrackets == p.OFF then
|
||||||
m.element("TreatAngleIncludeAsExternal", condition, "false")
|
m.element("TreatAngleIncludeAsExternal", condition, "false")
|
||||||
elseif cfg.externalanglebrackets == p.ON then
|
elseif cfg.externalanglebrackets == p.ON then
|
||||||
|
@ -264,7 +264,7 @@
|
|||||||
|
|
||||||
for _, dir in ipairs(extdirs or {}) do
|
for _, dir in ipairs(extdirs or {}) do
|
||||||
dir = project.getrelative(cfg.project, dir)
|
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))
|
table.insert(result, '/external:I' .. p.quoted(dir))
|
||||||
else
|
else
|
||||||
table.insert(result, '-I' .. p.quoted(dir))
|
table.insert(result, '-I' .. p.quoted(dir))
|
||||||
|
@ -20,7 +20,7 @@ Project configurations.
|
|||||||
### Availability ###
|
### Availability ###
|
||||||
|
|
||||||
Premake 5.0 or later.
|
Premake 5.0 or later.
|
||||||
Visual Studio 2022 version 17.0 or later.
|
Visual Studio 2019 version or later.
|
||||||
|
|
||||||
### See Also ###
|
### See Also ###
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ Project configurations.
|
|||||||
### Availability ###
|
### Availability ###
|
||||||
|
|
||||||
Premake 5.0 or later.
|
Premake 5.0 or later.
|
||||||
Visual Studio 2022 version 17.0 or later.
|
Visual Studio 2019 version or later.
|
||||||
|
|
||||||
### Examples ###
|
### Examples ###
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user