diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-05-23 16:25:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 16:25:25 -0700 |
| commit | 9b33bf50dae997b01dfe24878a58100da61b89e1 (patch) | |
| tree | 53f8a3012f23ba54c53a87a541e27d9901c39ea8 /PCbuild | |
| parent | 66dc33b6822be93f85d84d24d3f9159ff568fbbb (diff) | |
| download | cpython-git-9b33bf50dae997b01dfe24878a58100da61b89e1.tar.gz | |
Improves test_underpth_nosite_file to reveal why it fails. (#1763)
* Improves test_underpth_nosite_file to reveal why it fails.
* Enable building with Windows 10 SDK.
* Fix WinSDK detection
* Fix initialization on Windows when a ._pth file exists.
* Fix tabs
* Adds comment about Py_GetPath call.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/python.props | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/PCbuild/python.props b/PCbuild/python.props index d6bfd0877e..563487e0c3 100644 --- a/PCbuild/python.props +++ b/PCbuild/python.props @@ -63,6 +63,21 @@ <PythonExe Condition="'$(PythonExe)' == ''">$(BuildPath)python$(PyDebugExt).exe</PythonExe> </PropertyGroup> + <PropertyGroup Condition="$(DefaultWindowsSDKVersion) == ''"> + <!-- + Attempt to select the latest installed WinSDK. If we don't find any, then we will + let the MSBuild targets determine which one it wants to use (typically the earliest + possible version). Since we limit WINVER to Windows 7 anyway, it doesn't really + matter which WinSDK version we use. + --> + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion> + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.15063'">10.0.15063.0</DefaultWindowsSDKVersion> + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion> + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10586'">10.0.10586.0</DefaultWindowsSDKVersion> + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion> + <DefaultWindowsSDKVersion Condition="$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion) == '10.0.10240'">10.0.10240.0</DefaultWindowsSDKVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(OverrideVersion)' == ''"> <!-- Read version information from Include\patchlevel.h. The following properties are set: |