diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-06-11 22:35:55 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 22:35:55 (GMT) |
| commit | 36926df8341827fb2a5323f559daab8e34d33ed8 (patch) | |
| tree | 267ae93026a0c01d1cf42efb205baf02a5a7a847 /PCbuild | |
| parent | 785688832de699270530a9418e99c5c4caedbffb (diff) | |
| download | cpython-36926df8341827fb2a5323f559daab8e34d33ed8.zip cpython-36926df8341827fb2a5323f559daab8e34d33ed8.tar.gz cpython-36926df8341827fb2a5323f559daab8e34d33ed8.tar.bz2 | |
bpo-37238: Enable building for Windows using Visual Studio 2019 (GH-13988)
(cherry picked from commit 04856c2193eb72d72c46b57fa08095235d732a73)
Co-authored-by: Paul Monson <paulmon@users.noreply.github.com>
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/python.props | 1 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcxproj | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index 11638fe..e6642fc 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -10,6 +10,7 @@ We set BasePlatformToolset for ICC's benefit, it's otherwise ignored. --> + <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '16.0' or '$(VisualStudioVersion)' == '16.0')">v142</BasePlatformToolset> <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '15.0' or '$(VisualStudioVersion)' == '15.0')">v141</BasePlatformToolset> <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath14)' != ''">v140</BasePlatformToolset> <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and '$(VCTargetsPath12)' != ''">v120</BasePlatformToolset> diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 89625da..09a63c0 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -511,7 +511,7 @@ </ClCompile> </ItemGroup> </Target> - <Target Name="_WarnAboutToolset" BeforeTargets="PrepareForBuild" Condition="$(PlatformToolset) != 'v140' and $(PlatformToolset) != 'v141'"> + <Target Name="_WarnAboutToolset" BeforeTargets="PrepareForBuild" Condition="$(PlatformToolset) != 'v140' and $(PlatformToolset) != 'v141' and $(PlatformToolset) != 'v142'"> <Warning Text="Toolset $(PlatformToolset) is not used for official builds. Your build may have errors or incompatibilities." /> </Target> <Target Name="_WarnAboutZlib" BeforeTargets="PrepareForBuild" Condition="!$(IncludeExternals)"> |