diff options
| author | Ken Johnson <k.rjohnson94@outlook.com> | 2020-03-10 20:28:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 17:28:49 -0700 |
| commit | 93045f29748a614ae02b89d06beb9b5a5fd25fc9 (patch) | |
| tree | f1c05e0e848fa20b4c79052f3dffb8e9be219490 | |
| parent | cf405d4ed024f6517e1793e6dea1b5adacbc527a (diff) | |
| download | vcpkg-93045f29748a614ae02b89d06beb9b5a5fd25fc9.tar.gz vcpkg-93045f29748a614ae02b89d06beb9b5a5fd25fc9.zip | |
[freetype] Disabled Harfbuzz check for non-Windows platforms (#10073)
* Added ifdef and disabled Harfbuzz check for non-Windows machines
* Updated portfile and CONTROL as requested
| -rw-r--r-- | ports/freetype/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freetype/portfile.cmake | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index b965efca1..01c32bbbe 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,5 +1,5 @@ Source: freetype -Version: 2.10.1-4 +Version: 2.10.1-5 Build-Depends: zlib Homepage: https://www.freetype.org/ Description: A library to render fonts. diff --git a/ports/freetype/portfile.cmake b/ports/freetype/portfile.cmake index 7efc6d430..ad06263f9 100644 --- a/ports/freetype/portfile.cmake +++ b/ports/freetype/portfile.cmake @@ -31,6 +31,11 @@ else() set(ENABLE_DLL_EXPORT ON) endif() +set(OPTIONS) +if (NOT VCPKG_TARGET_IS_WINDOWS) + list(APPEND OPTIONS -DFT_DISABLE_FIND_PACKAGE_Harfbuzz=TRUE) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -39,6 +44,7 @@ vcpkg_configure_cmake( -DFT_WITH_ZLIB=ON # Force system zlib. ${FEATURE_OPTIONS} -DENABLE_DLL_EXPORT=${ENABLE_DLL_EXPORT} + ${OPTIONS} ) vcpkg_install_cmake() |