diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-08-06 22:07:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 13:07:46 -0700 |
| commit | 61c055a6fcfee2a7e764997bb2478adf49db6edf (patch) | |
| tree | 708267482f32dabbbb9b41f6c6e8dfb331b451a0 /ports/pango | |
| parent | 56174640c9b593f088145ea9cea70d84edf65c92 (diff) | |
| download | vcpkg-61c055a6fcfee2a7e764997bb2478adf49db6edf.tar.gz vcpkg-61c055a6fcfee2a7e764997bb2478adf49db6edf.zip | |
[brotli] add pkgconfig / [freetype] depend on brotli (#12405)
* [brotli] add pkgconfig
* [freetype] add pkgconfig and add dependency on brotli
* [qt5-base] add new freetype dependency to brotli and zstd
* [freetype] fix cmake paths
* [freetype] removed renaming of include dir and unnecessary cmake fixes
* [freetype-gl] fix glew include dir
* [podofo] fix freetype search.
* fixing wrong freetype stuff due to vcpkg owned wrong CMakeLists.txt .....
* fixing more freetype hidden issues.
* [sfml] fix missing include
* fix typo
* [freetype] uncomment previous renaming of include folders
* fix brotli linkage in static builds
* remove added alias to avoid problems.
* [freetype] add brotli to the wrapper
* [lzokay] format manifest
Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'ports/pango')
| -rw-r--r-- | ports/pango/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | ports/pango/CONTROL | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ports/pango/CMakeLists.txt b/ports/pango/CMakeLists.txt index 5fdd730ba..127b92319 100644 --- a/ports/pango/CMakeLists.txt +++ b/ports/pango/CMakeLists.txt @@ -49,11 +49,7 @@ find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h) find_library(FONTCONFIG_LIBRARY fontconfig) # find freetype -find_path(FREETYPE_INCLUDE_DIR ft2build.h) -if(CMAKE_BUILD_TYPE STREQUAL Debug) - set(FT_SUFFIX d) -endif() -find_library(FREETYPE_LIBRARY freetype${FT_SUFFIX}) +find_package(Freetype REQUIRED) # find harfbuzz find_path(HARFBUZZ_INCLUDE_DIR harfbuzz/hb.h) @@ -65,7 +61,7 @@ if (APPLE) endif() set(FONT_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIR} ${FONTCONFIG_INCLUDE_DIR} ${HARFBUZZ_INCLUDE_DIR}/harfbuzz) -set(FONT_LIBRARIES ${FREETYPE_LIBRARY} ${FONTCONFIG_LIBRARY} ${HARFBUZZ_LIBRARY}) +set(FONT_LIBRARIES Freetype::Freetype ${FONTCONFIG_LIBRARY} ${HARFBUZZ_LIBRARY}) macro(pango_add_module MODULE_NAME) add_library(${MODULE_NAME} ${ARGN}) diff --git a/ports/pango/CONTROL b/ports/pango/CONTROL index 2e1d6679e..cea8f1464 100644 --- a/ports/pango/CONTROL +++ b/ports/pango/CONTROL @@ -1,5 +1,6 @@ Source: pango -Version: 1.40.11-7 +Version: 1.40.11 +Port-Version: 8 Homepage: https://ftp.gnome.org/pub/GNOME/sources/pango/ Description: Text and font handling library. Build-Depends: glib, gettext, cairo[gobject], fontconfig, freetype, harfbuzz[glib] (!(windows&static)&!osx) |