diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-06 11:12:25 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-06 11:12:25 -0700 |
| commit | 79fcaafd0c486875c34f0e39356b3c95406cfd2d (patch) | |
| tree | 93a6dc78cb1145f6cb77b32fd2b772affb9d1967 | |
| parent | 4c33195759bfc2b3bde8628a6617f46040721330 (diff) | |
| download | vcpkg-79fcaafd0c486875c34f0e39356b3c95406cfd2d.tar.gz vcpkg-79fcaafd0c486875c34f0e39356b3c95406cfd2d.zip | |
[harfbuzz] Change glib dependency back to platform-dependent
| -rw-r--r-- | ports/harfbuzz/CONTROL | 2 | ||||
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index cff52498a..5ed9e68b8 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 367d12246..798743d45 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( |