From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 17 Jun 2019 15:43:35 +0000 (-0700)
Subject: bpo-37288: Fix Windows build when --no-tkinter is specified (GH-14096)
X-Git-Tag: v3.8.0b2~110
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=79d8204c4f02d02b3c6570de94c85863c27ddecb;p=python

bpo-37288: Fix Windows build when --no-tkinter is specified (GH-14096)

(cherry picked from commit 00f6493084c385033fe5574314223217d9a26672)

Co-authored-by: Paul Monson <paulmon@users.noreply.github.com>
---

diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index fdf8f12037..e37bcfb0b6 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -150,10 +150,10 @@ $(_PGOPath)
       <LicenseFiles Include="$(PySourcePath)LICENSE;
                              $(PySourcePath)PC\crtlicense.txt;
                              $(bz2Dir)LICENSE;
-                             $(opensslOutDir)LICENSE;
-                             $(tcltkDir)tcllicense.terms;
+                             $(opensslOutDir)LICENSE;" />
+      <LicenseFiles Include="$(tcltkDir)tcllicense.terms;
                              $(tcltkDir)tklicense.terms;
-                             $(tcltkDir)tixlicense.terms" />
+                             $(tcltkDir)tixlicense.terms" Condition="$(IncludeTkinter)" />
       <_LicenseFiles Include="@(LicenseFiles)">
         <Content>$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
       </_LicenseFiles>