diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-07-09 17:29:28 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-17 16:09:12 -0700 |
| commit | 984d95fa5f8892b1065d158a1d97ef70d00485e6 (patch) | |
| tree | 13b59f18990923d48b79df3a18dbb65d877c2ad1 /ports/harfbuzz | |
| parent | b4422a1b7ec3c0728108972c07f4daeaa2c9b2a8 (diff) | |
| download | vcpkg-984d95fa5f8892b1065d158a1d97ef70d00485e6.tar.gz vcpkg-984d95fa5f8892b1065d158a1d97ef70d00485e6.zip | |
[glib] Add unofficial exports to propagate static dependencies
Diffstat (limited to 'ports/harfbuzz')
| -rw-r--r-- | ports/harfbuzz/CONTROL | 2 | ||||
| -rw-r--r-- | ports/harfbuzz/glib-cmake.patch | 29 | ||||
| -rw-r--r-- | ports/harfbuzz/portfile.cmake | 1 |
3 files changed, 31 insertions, 1 deletions
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL index d503ca111..85ffb5e0a 100644 --- a/ports/harfbuzz/CONTROL +++ b/ports/harfbuzz/CONTROL @@ -1,5 +1,5 @@ Source: harfbuzz -Version: 1.8.2-2 +Version: 1.8.2-3 Description: HarfBuzz OpenType text shaping engine Build-Depends: freetype, ragel Default-Features: ucdn diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch new file mode 100644 index 000000000..cdd7f48a6 --- /dev/null +++ b/ports/harfbuzz/glib-cmake.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3c52731..8305f27 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -314,22 +314,12 @@ endif () + if (HB_HAVE_GLIB) + add_definitions(-DHAVE_GLIB) + +- # https://github.com/WebKit/webkit/blob/master/Source/cmake/FindGLIB.cmake +- find_package(PkgConfig) +- pkg_check_modules(PC_GLIB QUIET glib-2.0) +- +- find_library(GLIB_LIBRARIES NAMES glib-2.0 HINTS ${PC_GLIB_LIBDIR} ${PC_GLIB_LIBRARY_DIRS}) +- find_path(GLIBCONFIG_INCLUDE_DIR NAMES glibconfig.h HINTS ${PC_LIBDIR} ${PC_LIBRARY_DIRS} ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0/include) +- find_path(GLIB_INCLUDE_DIR NAMES glib.h HINTS ${PC_GLIB_INCLUDEDIR} ${PC_GLIB_INCLUDE_DIRS} PATH_SUFFIXES glib-2.0) +- +- include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR}) ++ find_package(unofficial-glib CONFIG REQUIRED) + + list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-glib.cc) + list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h) + +- list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES}) +- +- mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR) ++ list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib) + endif () + + if (HB_HAVE_ICU) diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 728b26fdb..0a6d41792 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_apply_patches( PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-uwp-build.patch" "${CMAKE_CURRENT_LIST_DIR}/find-package-freetype-2.patch" + "${CMAKE_CURRENT_LIST_DIR}/glib-cmake.patch" ) SET(HB_HAVE_ICU "OFF") |