Skip to content

[skia] Build configuration fix #25247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dan-shaw merged 2 commits into from
Jun 17, 2022
Merged

[skia] Build configuration fix #25247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68f3331
[skia] Build configuration fix
Chlumsky Jun 15, 2022
bfaa67f
[skia] Changed declared port-version
Chlumsky Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ports/skia/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions ports/skia/skiaConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$<$<CONFIG:Debug>:${SKIA_LIB_DBG}>")
target_link_libraries(skia INTERFACE "$<$<CONFIG:Release>:${SKIA_LIB_REL}>")

function(set_dependencies CONFIG LIBRARIES)
foreach(LIB ${LIBRARIES})
Expand Down
1 change: 1 addition & 0 deletions ports/skia/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6582,7 +6582,7 @@
},
"skia": {
"baseline": "2022-04-15",
"port-version": 0
"port-version": 1
},
"skyr-url": {
"baseline": "1.13.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/skia.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "99590977282f5689ae6f9d6e6f6b13fc8cbfd625",
"version-date": "2022-04-15",
"port-version": 1
},
{
"git-tree": "d167d79c12796fb226b9a869705fde2f4594e789",
"version-date": "2022-04-15",
Expand Down