aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2019-06-13 10:48:58 -0700
committerGitHub <noreply@github.com>2019-06-13 10:48:58 -0700
commitf1e5cd064d909687eeecfafd9033d8eb08c4092f (patch)
tree96092cf79722b7bb0cce3da7f93eac617e9cda12
parentd69ea6fe408d3af12613a26f4a987ed6d8bf0752 (diff)
downloadvcpkg-f1e5cd064d909687eeecfafd9033d8eb08c4092f.tar.gz
vcpkg-f1e5cd064d909687eeecfafd9033d8eb08c4092f.zip
[harfbuzz] Propagate dependency on glib downstream (#6879)
-rw-r--r--ports/harfbuzz/CONTROL2
-rw-r--r--ports/harfbuzz/portfile.cmake13
2 files changed, 14 insertions, 1 deletions
diff --git a/ports/harfbuzz/CONTROL b/ports/harfbuzz/CONTROL
index 133d0bc0e..d0e544d7a 100644
--- a/ports/harfbuzz/CONTROL
+++ b/ports/harfbuzz/CONTROL
@@ -1,5 +1,5 @@
Source: harfbuzz
-Version: 2.5.1
+Version: 2.5.1-1
Description: HarfBuzz OpenType text shaping engine
Build-Depends: freetype, ragel, gettext (osx)
Default-Features: ucdn
diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake
index d28bd656f..08b20f270 100644
--- a/ports/harfbuzz/portfile.cmake
+++ b/ports/harfbuzz/portfile.cmake
@@ -68,9 +68,22 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
+
vcpkg_fixup_cmake_targets(CONFIG_PATH share/harfbuzz TARGET_PATH share/harfbuzz)
+
vcpkg_copy_pdbs()
+if (HAVE_GLIB)
+ # Propagate dependency on glib downstream
+ file(READ "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" _contents)
+ file(WRITE "${CURRENT_PACKAGES_DIR}/share/harfbuzz/harfbuzzConfig.cmake" "
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-glib CONFIG)
+
+${_contents}
+")
+endif()
+
# Handle copyright
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/harfbuzz RENAME copyright)