3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[freetype] Fix cmake usage (#28217)

Browse Source
This commit is contained in:
Kai Pastor 2022-12-15 03:00:55 +01:00 committed by GitHub
parent 9074f83349
commit 7d74d8dc09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/freetype/brotli-static.patch
View File

@ -2,7 +2,7 @@ diff --git a/builds/cmake/FindBrotliDec.cmake b/builds/cmake/FindBrotliDec.cmake
index 46356b1fd..ed4cc2409 100644 index 46356b1fd..ed4cc2409 100644
--- a/builds/cmake/FindBrotliDec.cmake --- a/builds/cmake/FindBrotliDec.cmake
+++ b/builds/cmake/FindBrotliDec.cmake +++ b/builds/cmake/FindBrotliDec.cmake
@@ -35,10 +35,17 @@ find_path(BROTLIDEC_INCLUDE_DIRS @@ -35,10 +35,19 @@ find_path(BROTLIDEC_INCLUDE_DIRS
PATH_SUFFIXES brotli) PATH_SUFFIXES brotli)
find_library(BROTLIDEC_LIBRARIES find_library(BROTLIDEC_LIBRARIES
@ -11,13 +11,15 @@ index 46356b1fd..ed4cc2409 100644
HINTS ${PC_BROTLIDEC_LIBDIR} HINTS ${PC_BROTLIDEC_LIBDIR}
${PC_BROTLIDEC_LIBRARY_DIRS}) ${PC_BROTLIDEC_LIBRARY_DIRS})
+if(BROTLIDEC_LIBRARIES MATCHES "-static") +get_filename_component(z_vcpkg_freetype_brotlidec_name "${BROTLIDEC_LIBRARIES}" NAME)
+if(z_vcpkg_freetype_brotlidec_name MATCHES "-static")
+ find_library(BROTLICOMMON_LIBRARIES + find_library(BROTLICOMMON_LIBRARIES
+ NAMES brotlicommon-static + NAMES brotlicommon-static
+ HINTS ${PC_BROTLIDEC_LIBDIR} + HINTS ${PC_BROTLIDEC_LIBDIR}
+ ${PC_BROTLIDEC_LIBRARY_DIRS}) + ${PC_BROTLIDEC_LIBRARY_DIRS})
+ set(BROTLIDEC_LIBRARIES ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + set(BROTLIDEC_LIBRARIES "${BROTLIDEC_LIBRARIES};${BROTLICOMMON_LIBRARIES}")
+endif() +endif()
+unset(z_vcpkg_freetype_brotlidec_name)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args( find_package_handle_standard_args(

2
ports/freetype/portfile.cmake
View File

@ -76,7 +76,7 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake"
"${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY) "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
vcpkg_install_copyright( vcpkg_install_copyright(
FILE_LIST FILE_LIST
"${SOURCE_PATH}/LICENSE.TXT" "${SOURCE_PATH}/LICENSE.TXT"

4
ports/freetype/usage Normal file
View File

@ -0,0 +1,4 @@
freetype is compatible with built-in CMake targets:
find_package(Freetype REQUIRED)
target_link_libraries(main PRIVATE Freetype::Freetype) # since CMake 3.10

2
ports/freetype/vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "freetype", "name": "freetype",
"version": "2.12.1", "version": "2.12.1",
"port-version": 2, "port-version": 3,
"description": "A library to render fonts.", "description": "A library to render fonts.",
"homepage": "https://www.freetype.org/", "homepage": "https://www.freetype.org/",
"license": "FTL OR GPL-2.0-or-later", "license": "FTL OR GPL-2.0-or-later",

2
versions/baseline.json
View File

@ -2458,7 +2458,7 @@
}, },
"freetype": { "freetype": {
"baseline": "2.12.1", "baseline": "2.12.1",
"port-version": 2 "port-version": 3
}, },
"freetype-gl": { "freetype-gl": {
"baseline": "2022-01-17", "baseline": "2022-01-17",

5
versions/f-/freetype.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "db92ea87ff12339808263710675221df6a06ac15",
"version": "2.12.1",
"port-version": 3
},
{ {
"git-tree": "f1d6772ea2cb8cd74146b263b5dab534a10dd641", "git-tree": "f1d6772ea2cb8cd74146b263b5dab534a10dd641",
"version": "2.12.1", "version": "2.12.1",