diff --git a/ports/harfbuzz/harfbuzzConfig.cmake.in b/ports/harfbuzz/harfbuzzConfig.cmake.in index 8c69106d5b4c4f..d072e5171e2b94 100644 --- a/ports/harfbuzz/harfbuzzConfig.cmake.in +++ b/ports/harfbuzz/harfbuzzConfig.cmake.in @@ -3,6 +3,8 @@ cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0057 NEW) +include(CMakeFindDependencyMacro) + # Traditional find module variables (vcpkg polyfill) set(HARFBUZZ_INCLUDE_DIR "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include/harfbuzz" CACHE INTERNAL "") set(HARFBUZZ_INCLUDE_DIRS "${HARFBUZZ_INCLUDE_DIR}") @@ -14,18 +16,25 @@ if(TARGET harfbuzz) return() endif() -include(CMakeFindDependencyMacro) - -add_library(harfbuzz INTERFACE IMPORTED GLOBAL) +add_library(harfbuzz UNKNOWN IMPORTED) add_library(harfbuzz::harfbuzz ALIAS harfbuzz) find_library(HARFBUZZ_LIBRARY_DEBUG NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) -if(HARFBUZZ_LIBRARY_DEBUG) - target_link_libraries(harfbuzz INTERFACE $<$:${HARFBUZZ_LIBRARY_DEBUG}>) -endif() - find_library(HARFBUZZ_LIBRARY_RELEASE NAMES harfbuzz PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) -target_link_libraries(harfbuzz INTERFACE $<$>:${HARFBUZZ_LIBRARY_RELEASE}>) +if(NOT HARFBUZZ_LIBRARY_DEBUG) + set_target_properties(harfbuzz PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS "RELEASE" + IMPORTED_LOCATION_RELEASE "${HARFBUZZ_LIBRARY_RELEASE}" + ) +else() + set_target_properties(harfbuzz PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${HARFBUZZ_INCLUDE_DIR}" + IMPORTED_CONFIGURATIONS "DEBUG;RELEASE" + IMPORTED_LOCATION_RELEASE "${HARFBUZZ_LIBRARY_RELEASE}" + IMPORTED_LOCATION_DEBUG "${HARFBUZZ_LIBRARY_DEBUG}" + ) +endif() set(HARFBUZZ_FEATURES @FEATURES@) @@ -41,25 +50,21 @@ target_link_libraries(harfbuzz INTERFACE freetype) if ("graphite2" IN_LIST HARFBUZZ_FEATURES) find_library(GRAPHITE2_LIBRARY_DEBUG NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) - if(GRAPHITE2_LIBRARY_DEBUG) - target_link_libraries(harfbuzz INTERFACE $<$:${GRAPHITE2_LIBRARY_DEBUG}>) - endif() - find_library(GRAPHITE2_LIBRARY_RELEASE NAMES graphite2 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) - if(GRAPHITE2_LIBRARY_RELEASE) - target_link_libraries(harfbuzz INTERFACE $<$>:${GRAPHITE2_LIBRARY_RELEASE}>) + if(NOT GRAPHITE2_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE "${GRAPHITE2_LIBRARY_RELEASE}") + else() + target_link_libraries(harfbuzz INTERFACE "$<$>:${GRAPHITE2_LIBRARY_RELEASE}>$<$:${GRAPHITE2_LIBRARY_DEBUG}>") endif() endif() if ("glib" IN_LIST HARFBUZZ_FEATURES) find_library(GLIB_LIBRARY_DEBUG NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" PATH_SUFFIXES lib NO_DEFAULT_PATH) - if(GLIB_LIBRARY_DEBUG) - target_link_libraries(harfbuzz INTERFACE $<$:${GLIB_LIBRARY_DEBUG}>) - endif() - find_library(GLIB_LIBRARY_RELEASE NAMES glib glib-2.0 PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" PATH_SUFFIXES lib NO_DEFAULT_PATH) - if(GLIB_LIBRARY_RELEASE) - target_link_libraries(harfbuzz INTERFACE $<$>:${GLIB_LIBRARY_RELEASE}>) + if(NOT GLIB_LIBRARY_DEBUG) + target_link_libraries(harfbuzz INTERFACE "${GLIB_LIBRARY_RELEASE}") + else() + target_link_libraries(harfbuzz INTERFACE "$<$>:${GLIB_LIBRARY_RELEASE}>$<$:${GLIB_LIBRARY_DEBUG}>") endif() endif() @@ -67,5 +72,3 @@ if ("icu" IN_LIST HARFBUZZ_FEATURES) find_dependency(ICU 61 COMPONENTS uc) target_link_libraries(harfbuzz INTERFACE ICU::uc) endif() - -target_include_directories(harfbuzz INTERFACE "${HARFBUZZ_INCLUDE_DIR}") diff --git a/ports/harfbuzz/portfile.cmake b/ports/harfbuzz/portfile.cmake index 09d9777cf882e5..510f40d2e1d8e0 100644 --- a/ports/harfbuzz/portfile.cmake +++ b/ports/harfbuzz/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO harfbuzz/harfbuzz REF ${VERSION} - SHA512 23d6abbd270885d7ae1ebb3c981f0c331a48d891e23caffe9e254f5e7e205bb0348add7b371526166a49b336f8076f92c11ef76ca81f48a6fd9f58812ec96d79 + SHA512 3fe54adbdd457c7dd8186c897436982a43e195a62bc0e830fe2dd06ca2c52511b9a717c659a7e30d235ac964df071e8ba1d9f36ee20496a1a80945d7c63fce86 HEAD_REF master PATCHES fix-win32-build.patch diff --git a/ports/harfbuzz/vcpkg.json b/ports/harfbuzz/vcpkg.json index 022969c466c700..89367789e143b7 100644 --- a/ports/harfbuzz/vcpkg.json +++ b/ports/harfbuzz/vcpkg.json @@ -1,7 +1,7 @@ { "name": "harfbuzz", - "version": "8.2.1", - "port-version": 3, + "version": "8.3.0", + "port-version": 1, "description": "HarfBuzz OpenType text shaping engine", "homepage": "https://github.com/harfbuzz/harfbuzz", "license": "MIT-Modern-Variant", diff --git a/versions/baseline.json b/versions/baseline.json index bf9153bf560d0f..fbcd7fa914a3d3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3209,8 +3209,8 @@ "port-version": 1 }, "harfbuzz": { - "baseline": "8.2.1", - "port-version": 3 + "baseline": "8.3.0", + "port-version": 1 }, "hash-library": { "baseline": "8", diff --git a/versions/h-/harfbuzz.json b/versions/h-/harfbuzz.json index 1cf75441ac7ca1..b6d5550fefdd8f 100644 --- a/versions/h-/harfbuzz.json +++ b/versions/h-/harfbuzz.json @@ -1,5 +1,15 @@ { "versions": [ + { + "git-tree": "6e2d07391d009a33797b19b707bf5bc60cdb17e5", + "version": "8.3.0", + "port-version": 1 + }, + { + "git-tree": "43649e54cfda3d4673975cf61daf8e501edf63e6", + "version": "8.3.0", + "port-version": 0 + }, { "git-tree": "5baafcf92a1de9e3b94fba26f36f4287dad722fb", "version": "8.2.1",