diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2021-04-29 13:30:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-29 13:30:24 -0700 |
| commit | 4f942e1b11b43c2ee9399bb20cc775642d4f5c55 (patch) | |
| tree | 08b20b3f725a0a062a39a9b0bd4f31f3a283c354 | |
| parent | 387623e87860fd761f68e99a305a7b17f2f174e8 (diff) | |
| download | vcpkg-4f942e1b11b43c2ee9399bb20cc775642d4f5c55.tar.gz vcpkg-4f942e1b11b43c2ee9399bb20cc775642d4f5c55.zip | |
[python3] Disable registry access to determine WinSDK (#17579)
Co-authored-by: Robert Schumacher <ras0219@outlook.com>
| -rw-r--r-- | ports/python3/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/python3/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/p-/python3.json | 5 |
4 files changed, 12 insertions, 2 deletions
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake index 3a90a7913..d19f5552c 100644 --- a/ports/python3/portfile.cmake +++ b/ports/python3/portfile.cmake @@ -88,6 +88,11 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) "/p:ForceImportBeforeCppTargets=${SOURCE_PATH}/PCbuild/python_vcpkg.props" ) endif() + string(REPLACE "\\" "" WindowsSDKVersion "$ENV{WindowsSDKVersion}") + list(APPEND OPTIONS + "/p:WindowsTargetPlatformVersion=${WindowsSDKVersion}" + "/p:DefaultWindowsSDKVersion=${WindowsSDKVersion}" + ) if(VCPKG_TARGET_IS_UWP) list(APPEND OPTIONS "/p:IncludeUwp=true") else() diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json index f997398f8..5f7675cd0 100644 --- a/ports/python3/vcpkg.json +++ b/ports/python3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "python3", "version-string": "3.9.2", - "port-version": 1, + "port-version": 2, "description": "The Python programming language", "homepage": "https://github.com/python/cpython", "supports": "!(arm | uwp)", diff --git a/versions/baseline.json b/versions/baseline.json index c3ac79495..fd37a0de3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4966,7 +4966,7 @@ }, "python3": { "baseline": "3.9.2", - "port-version": 1 + "port-version": 2 }, "qca": { "baseline": "2.3.1", diff --git a/versions/p-/python3.json b/versions/p-/python3.json index 5f6f0d414..a8c9121fc 100644 --- a/versions/p-/python3.json +++ b/versions/p-/python3.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ebb4ed9ed737c672ca5462a4019a704b6461e91d", + "version-string": "3.9.2", + "port-version": 2 + }, + { "git-tree": "025737aca98a8b23d4ea8de388dacfba6b844eca", "version-string": "3.9.2", "port-version": 1 |