From 79fcaafd0c486875c34f0e39356b3c95406cfd2d Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 6 Jun 2017 11:12:25 -0700 Subject: [PATCH] [harfbuzz] Change glib dependency back to platform-dependent --- ports/harfbuzz/CONTROL | 2 +- ports/harfbuzz/portfile.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index cff52498a3..5ed9e68b81 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,4 +1,4 @@ Source: harfbuzz Version: 1.4.6-1 Description: HarfBuzz OpenType text shaping engine -Build-Depends: freetype, glib [x86], glib [x64] +Build-Depends: freetype, glib [windows] diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 367d122462..798743d452 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -12,12 +12,12 @@ vcpkg_apply_patches( PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp-build.patch" ) -if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm") +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") SET(HAVE_GLIB "OFF") - SET(BUILTIN_UCDN "ON") + SET(BUILTIN_UCDN "ON") else() SET(HAVE_GLIB "ON") - SET(BUILTIN_UCDN "OFF") + SET(BUILTIN_UCDN "OFF") endif() vcpkg_configure_cmake(