diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-06-30 12:24:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-30 12:24:42 -0700 |
| commit | 6843a3b9300eb80c2bf5dac7dd363dae9e6f000d (patch) | |
| tree | 5329dec7d5441f010f3cf79a0982c6353e313a08 | |
| parent | a5764d3d96341441d3f70fb5c96a82610a3f4842 (diff) | |
| download | cpython-git-6843a3b9300eb80c2bf5dac7dd363dae9e6f000d.tar.gz | |
bpo-44535: Enable building with Visual Studio 2022 on Windows (GH-26962)
(cherry picked from commit d3a95c1b6eacbbbd92c294744e7ed41932f3f63e)
Co-authored-by: Steve Dower <steve.dower@python.org>
| -rw-r--r-- | Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst | 1 | ||||
| -rw-r--r-- | PCbuild/python.props | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst b/Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst new file mode 100644 index 0000000000..e06d0d3048 --- /dev/null +++ b/Misc/NEWS.d/next/Build/2021-06-30-02-32-46.bpo-44535.M9iN4-.rst @@ -0,0 +1 @@ +Enable building using a Visual Studio 2022 install on Windows. diff --git a/PCbuild/python.props b/PCbuild/python.props index 4a56d50b8b..60625101b4 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -11,6 +11,7 @@ We set BasePlatformToolset for ICC's benefit, it's otherwise ignored. --> + <BasePlatformToolset Condition="'$(BasePlatformToolset)' == '' and ('$(MSBuildToolsVersion)' == '17.0' or '$(VisualStudioVersion)' == '17.0')">v142</BasePlatformToolset> <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> |