From 93045f29748a614ae02b89d06beb9b5a5fd25fc9 Mon Sep 17 00:00:00 2001 From: Ken Johnson Date: Tue, 10 Mar 2020 20:28:49 -0400 Subject: [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 --- ports/freetype/CONTROL | 2 +- ports/freetype/portfile.cmake | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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() -- cgit v1.2.3