aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkrow <40317194+kroware@users.noreply.github.com>2018-07-03 21:24:02 +0800
committerRobert Schumacher <roschuma@microsoft.com>2018-07-03 06:24:02 -0700
commit084eb43343e4024d38f1cbc0a5d2afe159338920 (patch)
treeb0219fa608884dd3238505cef7a26235328b9979
parent929f2d9b9b78ce291554b3980c88155639617f80 (diff)
downloadvcpkg-084eb43343e4024d38f1cbc0a5d2afe159338920.tar.gz
vcpkg-084eb43343e4024d38f1cbc0a5d2afe159338920.zip
Add icu support for harfbuzz (#3738)
* Add icu support for harfbuzz * [harfbuzz] Set feature OFF if not provided instead of leaving it blank.
-rw-r--r--ports/harfbuzz/CONTROL4
-rw-r--r--ports/harfbuzz/portfile.cmake6
2 files changed, 10 insertions, 0 deletions
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index d7aa0732c..3ad5ed8d6 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -2,3 +2,7 @@ Source: harfbuzz
Version: 1.8.1
Description: HarfBuzz OpenType text shaping engine
Build-Depends: freetype, ragel, glib (windows)
+
+Feature: icu
+Build-Depends: icu
+Description: icu support for harfbuzz
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index 31081929c..10b0fc80a 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -15,6 +15,11 @@ vcpkg_apply_patches(
"${CMAKE_CURRENT_LIST_DIR}/find-package-freetype-2.patch"
)
+SET(HB_HAVE_ICU "OFF")
+if("icu" IN_LIST FEATURES)
+ SET(HB_HAVE_ICU "ON")
+endif()
+
if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_CMAKE_SYSTEM_NAME)
SET(HAVE_GLIB "OFF")
SET(BUILTIN_UCDN "ON")
@@ -30,6 +35,7 @@ vcpkg_configure_cmake(
-DHB_HAVE_FREETYPE=ON
-DHB_HAVE_GLIB=${HAVE_GLIB}
-DHB_BUILTIN_UCDN=${BUILTIN_UCDN}
+ -DHB_HAVE_ICU=${HB_HAVE_ICU}
OPTIONS_DEBUG
-DSKIP_INSTALL_HEADERS=ON
)