summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-09-11 13:31:27 (GMT)
committerGitHub <noreply@github.com>2019-09-11 13:31:27 (GMT)
commitda38ec1d4862ffb58faec41ed367719e81801766 (patch)
tree0ec9660be8eb059d6a79dd02bd8a0acce7b0c99b
parentc97ee1d3d8fdcbe6ca560767b532198027457d80 (diff)
downloadcpython-da38ec1d4862ffb58faec41ed367719e81801766.zip
cpython-da38ec1d4862ffb58faec41ed367719e81801766.tar.gz
cpython-da38ec1d4862ffb58faec41ed367719e81801766.tar.bz2
bpo-37326: Include libffi license when available (GH-15921)
(cherry picked from commit 8fcaffb048d2359a4c06ed5d8fbbf46d3ae1a472) Co-authored-by: Steve Dower <steve.dower@python.org>
-rw-r--r--PCbuild/python.vcxproj5
1 files changed, 3 insertions, 2 deletions
diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj
index e37bcfb..2094420 100644
--- a/PCbuild/python.vcxproj
+++ b/PCbuild/python.vcxproj
@@ -150,12 +150,13 @@ $(_PGOPath)
<LicenseFiles Include="$(PySourcePath)LICENSE;
$(PySourcePath)PC\crtlicense.txt;
$(bz2Dir)LICENSE;
- $(opensslOutDir)LICENSE;" />
+ $(opensslOutDir)LICENSE;
+ $(libffiDir)LICENSE;" />
<LicenseFiles Include="$(tcltkDir)tcllicense.terms;
$(tcltkDir)tklicense.terms;
$(tcltkDir)tixlicense.terms" Condition="$(IncludeTkinter)" />
<_LicenseFiles Include="@(LicenseFiles)">
- <Content>$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
+ <Content Condition="Exists(%(FullPath))">$([System.IO.File]::ReadAllText(%(FullPath)))</Content>
</_LicenseFiles>
</ItemGroup>