diff --git a/ports/skia/portfile.cmake b/ports/skia/portfile.cmake index 6c68b7fc94ec3d..915189d62b9f3e 100644 --- a/ports/skia/portfile.cmake +++ b/ports/skia/portfile.cmake @@ -377,7 +377,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") //:skia) gn_desc_target_defines(SKIA_DEFINITIONS_DBG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg" - //extract_public_config:extract_skia) + //:skia) endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") @@ -386,7 +386,7 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") //:skia) gn_desc_target_defines(SKIA_DEFINITIONS_REL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel" - //extract_public_config:extract_skia) + //:skia) endif() configure_file("${CMAKE_CURRENT_LIST_DIR}/skiaConfig.cmake.in" diff --git a/ports/skia/skiaConfig.cmake.in b/ports/skia/skiaConfig.cmake.in index 62f816a6ba44e1..98b491206a365f 100644 --- a/ports/skia/skiaConfig.cmake.in +++ b/ports/skia/skiaConfig.cmake.in @@ -13,8 +13,10 @@ if(_IMPORT_PREFIX STREQUAL "/") set(_IMPORT_PREFIX "") endif() -find_library(SKIA_LIB NAMES skia skia.dll) -target_link_libraries(skia INTERFACE "${SKIA_LIB}") +find_library(SKIA_LIB_DBG NAMES skia skia.dll PATHS ${_IMPORT_PREFIX}/debug/lib NO_DEFAULT_PATH) +find_library(SKIA_LIB_REL NAMES skia skia.dll PATHS ${_IMPORT_PREFIX}/lib NO_DEFAULT_PATH) +target_link_libraries(skia INTERFACE "$<$:${SKIA_LIB_DBG}>") +target_link_libraries(skia INTERFACE "$<$:${SKIA_LIB_REL}>") function(set_dependencies CONFIG LIBRARIES) foreach(LIB ${LIBRARIES}) diff --git a/ports/skia/vcpkg.json b/ports/skia/vcpkg.json index 39f604a2d52a82..39414acf3f1d67 100644 --- a/ports/skia/vcpkg.json +++ b/ports/skia/vcpkg.json @@ -1,6 +1,7 @@ { "name": "skia", "version-date": "2022-04-15", + "port-version": 1, "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.", diff --git a/versions/baseline.json b/versions/baseline.json index 772478c7fb447a..36a09586557956 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6582,7 +6582,7 @@ }, "skia": { "baseline": "2022-04-15", - "port-version": 0 + "port-version": 1 }, "skyr-url": { "baseline": "1.13.0", diff --git a/versions/s-/skia.json b/versions/s-/skia.json index 00a465e3e9ca34..429212d01103b6 100644 --- a/versions/s-/skia.json +++ b/versions/s-/skia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99590977282f5689ae6f9d6e6f6b13fc8cbfd625", + "version-date": "2022-04-15", + "port-version": 1 + }, { "git-tree": "d167d79c12796fb226b9a869705fde2f4594e789", "version-date": "2022-04-15",