only set XPDeprecationWarning to false when choosing toolset v141_xp …

…in config; add tests
premake · Apr 30, 2020 · df58fd9 · df58fd9
1 parent aedeb32
commit df58fd9
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 6 deletions.
diff --git a/modules/vstudio/tests/vc2010/test_globals.lua b/modules/vstudio/tests/vc2010/test_globals.lua
@@ -290,6 +290,42 @@ end
 	end
 
 
+	function suite.canSetXPDeprecationWarningToFalse_withV141XP()
+		toolset "v141_xp"
+		prepare()
+		test.capture [[
+<PropertyGroup Label="Globals">
+	<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
+	<Keyword>Win32Proj</Keyword>
+	<RootNamespace>MyProject</RootNamespace>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Globals">
+	<XPDeprecationWarning>false</XPDeprecationWarning>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
+	<XPDeprecationWarning>false</XPDeprecationWarning>
+</PropertyGroup>
+		]]
+	end
+
+
+	function suite.canSetXPDeprecationWarningToFalse_perConfig_withV141XP()
+		filter "Release"
+			toolset "v141_xp"
+		prepare()
+		test.capture [[
+<PropertyGroup Label="Globals">
+	<ProjectGuid>{42B5DBC6-AE1F-903D-F75D-41E363076E92}</ProjectGuid>
+	<Keyword>Win32Proj</Keyword>
+	<RootNamespace>MyProject</RootNamespace>
+</PropertyGroup>
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Globals">
+	<XPDeprecationWarning>false</XPDeprecationWarning>
+</PropertyGroup>
+		]]
+	end
+
+
 	function suite.windowsTargetPlatformVersion_latest_on2019()
 		p.action.set("vs2019")
 		systemversion "latest"

diff --git a/modules/vstudio/vs2010_vcxproj.lua b/modules/vstudio/vs2010_vcxproj.lua
@@ -126,7 +126,6 @@
 
 	m.elements.globals = function(prj)
 		return {
-			m.xpDeprecationWarning,
 			m.projectGuid,
 			m.ignoreWarnDuplicateFilename,
 			m.keyword,
@@ -140,6 +139,7 @@
 	m.elements.globalsCondition = function(prj, cfg)
 		return {
 			m.windowsTargetPlatformVersion,
+			m.xpDeprecationWarning,
 		}
 	end
 
@@ -2413,11 +2413,6 @@
 	end
 
 
-	function m.xpDeprecationWarning(prj)
-		m.element("XPDeprecationWarning", nil, "false")
-	end
-
-
 	function m.projectGuid(prj)
 		m.element("ProjectGuid", nil, "{%s}", prj.uuid)
 	end
@@ -2629,6 +2624,13 @@
 	end
 
 
+	function m.xpDeprecationWarning(prj, cfg)
+		if cfg.toolset == "msc-v141_xp" then
+			m.element("XPDeprecationWarning", nil, "false")
+		end
+	end
+
+
 	function m.preferredToolArchitecture(prj)
 		if _ACTION >= "vs2013" then
 			if prj.preferredtoolarchitecture == p.X86_64 then