diff options
| author | Steve Dower <steve.dower@python.org> | 2020-03-11 11:18:12 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-11 11:18:12 (GMT) |
| commit | 2dd41740c97bd77695ddcc590caa7f53e76dc35a (patch) | |
| tree | e0a323fafc27dc4660f5783faa5274ecd6c37562 /PCbuild/pythoncore.vcxproj | |
| parent | 39c34933fc958fd773ebf14ccd2e0224450b17ed (diff) | |
| download | cpython-2dd41740c97bd77695ddcc590caa7f53e76dc35a.zip cpython-2dd41740c97bd77695ddcc590caa7f53e76dc35a.tar.gz cpython-2dd41740c97bd77695ddcc590caa7f53e76dc35a.tar.bz2 | |
bpo-39930: Ensure vcruntime140.dll is included in all Windows packages (GH-18918)
Also adds GitHub CI test for Windows installer changes
Diffstat (limited to 'PCbuild/pythoncore.vcxproj')
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index ac73a91..30603b0 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -527,15 +527,7 @@ <Warning Text="Not including zlib is not a supported configuration." /> </Target> - <PropertyGroup> - <VCRedistDir>$(VCInstallDir)\Redist\MSVC\$(VCToolsRedistVersion)\</VCRedistDir> - <VCRedistDir Condition="$(Platform) == 'Win32'">$(VCRedistDir)x86\</VCRedistDir> - <VCRedistDir Condition="$(Platform) != 'Win32'">$(VCRedistDir)$(Platform)\</VCRedistDir> - </PropertyGroup> - <ItemGroup Condition="$(VCInstallDir) != ''"> - <VCRuntimeDLL Include="$(VCRedistDir)\**\vcruntime*.dll" /> - </ItemGroup> - <Target Name="_CopyVCRuntime" AfterTargets="Build" Inputs="@(VCRuntimeDLL)" Outputs="$(OutDir)%(Filename)%(Extension)"> + <Target Name="_CopyVCRuntime" AfterTargets="Build" Inputs="@(VCRuntimeDLL)" Outputs="$(OutDir)%(Filename)%(Extension)" DependsOnTargets="FindVCRuntime"> <!-- bpo-38597: When we switch to another VCRuntime DLL, include vcruntime140.dll as well --> <Warning Text="A copy of vcruntime140.dll is also required" Condition="!$(VCToolsRedistVersion.StartsWith(`14.`))" /> <Copy SourceFiles="%(VCRuntimeDLL.FullPath)" DestinationFolder="$(OutDir)" /> |