diff options
| author | angelmixu <salemixu@gmail.com> | 2020-01-30 21:48:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-30 12:48:56 -0800 |
| commit | 3cc9a6f743e42a189ca39ce28dab8904a5afa1f9 (patch) | |
| tree | 6a7034f4517fdeca05282371d08506c996783e56 | |
| parent | 533b881fff0480f90d15fac3f533eda51faba538 (diff) | |
| download | vcpkg-3cc9a6f743e42a189ca39ce28dab8904a5afa1f9.tar.gz vcpkg-3cc9a6f743e42a189ca39ce28dab8904a5afa1f9.zip | |
[pango] fix macOS dynamic library (#9801)
| -rw-r--r-- | ports/pango/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | ports/pango/CONTROL | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index a505a5b65..5fdd730ba 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -59,6 +59,11 @@ find_library(FREETYPE_LIBRARY freetype${FT_SUFFIX}) find_path(HARFBUZZ_INCLUDE_DIR harfbuzz/hb.h) find_library(HARFBUZZ_LIBRARY harfbuzz) +if (APPLE) + find_library(COREFOUNDATION_LIBRARY CoreFoundation) + link_libraries(${COREFOUNDATION_LIBRARY}) +endif() + set(FONT_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR} ${FONTCONFIG_INCLUDE_DIR} ${HARFBUZZ_INCLUDE_DIR}/harfbuzz) set(FONT_LIBRARIES ${FREETYPE_LIBRARY} ${FONTCONFIG_LIBRARY} ${HARFBUZZ_LIBRARY}) @@ -151,7 +156,11 @@ if(WIN32) endif() pango_add_module(pangocairo ${PANGO_CAIRO_SOURCES}) -target_link_libraries(pangocairo ${CAIRO_LIBRARIES} pango pangowin32 pangoft2 ${FONT_LIBRARIES}) +list(APPEND PANGO_CAIRO_LIBRARIES ${CAIRO_LIBRARIES} pango pangoft2 ${FONT_LIBRARIES}) +if (WIN32) + list(APPEND PANGO_CAIRO_LIBRARIES pangowin32) +endif() +target_link_libraries(pangocairo ${PANGO_CAIRO_LIBRARIES}) target_include_directories(pangocairo PRIVATE ${CAIRO_INCLUDE_DIR} ${FONT_INCLUDE_DIRS}) diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index 62220dbef..98c09ee3f 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,5 +1,5 @@ Source: pango -Version: 1.40.11-5 +Version: 1.40.11-6 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ Description: Text and font handling library. Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz[glib] (!(windows&static)) |
