mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 05:39:06 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[skia] Set the win_sdk gn arg to %WindowsSdkDir% on Windows (#41486)

Browse Source
This commit is contained in:
Andrew Kaster 2024-10-15 21:55:40 -06:00 committed by GitHub
parent fa7a35ab8c
commit f0570dc411
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/skia/portfile.cmake
View File

@ -262,7 +262,9 @@ vcpkg_cmake_get_vars(cmake_vars_file)
include("${cmake_vars_file}") include("${cmake_vars_file}")
if(VCPKG_TARGET_IS_WINDOWS) if(VCPKG_TARGET_IS_WINDOWS)
string(REGEX REPLACE "[\\]\$" "" WIN_VC "$ENV{VCINSTALLDIR}") string(REGEX REPLACE "[\\]\$" "" WIN_VC "$ENV{VCINSTALLDIR}")
string(REGEX REPLACE "[\\]\$" "" WIN_SDK "$ENV{WindowsSdkDir}")
string(APPEND OPTIONS " win_vc=\"${WIN_VC}\"") string(APPEND OPTIONS " win_vc=\"${WIN_VC}\"")
string(APPEND OPTIONS " win_sdk=\"${WIN_SDK}\"")
elseif(VCPKG_TARGET_IS_ANDROID) elseif(VCPKG_TARGET_IS_ANDROID)
string(APPEND OPTIONS " ndk=\"${VCPKG_DETECTED_CMAKE_ANDROID_NDK}\" ndk_api=${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}") string(APPEND OPTIONS " ndk=\"${VCPKG_DETECTED_CMAKE_ANDROID_NDK}\" ndk_api=${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}")
else() else()

2
ports/skia/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "skia", "name": "skia",
"version": "129", "version": "129",
"port-version": 1, "port-version": 2,
"description": [ "description": [
"Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.", "Skia is an open source 2D graphics library which provides common APIs that work across a variety of hardware and software platforms.",
"It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.", "It serves as the graphics engine for Google Chrome and Chrome OS, Android, Mozilla Firefox and Firefox OS, and many other products.",

2
versions/baseline.json
View File

@ -8362,7 +8362,7 @@
}, },
"skia": { "skia": {
"baseline": "129", "baseline": "129",
"port-version": 1 "port-version": 2
}, },
"skyr-url": { "skyr-url": {
"baseline": "1.13.0", "baseline": "1.13.0",

5
versions/s-/skia.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "942c0f5227b85eb96fad153a7b57c12debb33b4c",
"version": "129",
"port-version": 2
},
{ {
"git-tree": "886519547ba2addf980c4c567bca7f4c4d686d2f", "git-tree": "886519547ba2addf980c4c567bca7f4c4d686d2f",
"version": "129", "version": "129",