]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Allow python_uwp.vcxproj to build with toolset v142 if present (GH-18777)
authorSteve Dower <steve.dower@python.org>
Wed, 4 Mar 2020 19:46:50 +0000 (19:46 +0000)
committerNed Deily <nad@python.org>
Tue, 10 Mar 2020 05:46:07 +0000 (01:46 -0400)
PCbuild/python_uwp.vcxproj
PCbuild/pythonw_uwp.vcxproj

index 14e138cbed3e0094cdfcd86b7a4b619d3ce88c30..5d94a321d40dbd4e58413781af1a27430d9fbec1 100644 (file)
@@ -36,6 +36,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9DE9E23D-C8D4-4817-92A9-920A8B1FE5FF}</ProjectGuid>
+    <PlatformToolset Condition="'$(PlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '16.0' or '$(VisualStudioVersion)' == '16.0')">v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="python.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
index 79e105877fbeb26f7534c141c4ddee38439e2a93..3da05e351d483096865f87874be363040ab3f2fc 100644 (file)
@@ -36,6 +36,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{AB603547-1E2A-45B3-9E09-B04596006393}</ProjectGuid>
+    <PlatformToolset Condition="'$(PlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '16.0' or '$(VisualStudioVersion)' == '16.0')">v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="python.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />