mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 01:30:55 +08:00
[skia] Set the win_sdk gn arg to %WindowsSdkDir% on Windows (#41486)
This commit is contained in:
parent
fa7a35ab8c
commit
f0570dc411
@ -262,7 +262,9 @@ vcpkg_cmake_get_vars(cmake_vars_file)
|
||||
include("${cmake_vars_file}")
|
||||
if(VCPKG_TARGET_IS_WINDOWS)
|
||||
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_sdk=\"${WIN_SDK}\"")
|
||||
elseif(VCPKG_TARGET_IS_ANDROID)
|
||||
string(APPEND OPTIONS " ndk=\"${VCPKG_DETECTED_CMAKE_ANDROID_NDK}\" ndk_api=${VCPKG_DETECTED_CMAKE_SYSTEM_VERSION}")
|
||||
else()
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "skia",
|
||||
"version": "129",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": [
|
||||
"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.",
|
||||
|
@ -8362,7 +8362,7 @@
|
||||
},
|
||||
"skia": {
|
||||
"baseline": "129",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"skyr-url": {
|
||||
"baseline": "1.13.0",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "942c0f5227b85eb96fad153a7b57c12debb33b4c",
|
||||
"version": "129",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "886519547ba2addf980c4c567bca7f4c4d686d2f",
|
||||
"version": "129",
|
||||
|
Loading…
x
Reference in New Issue
Block a user