From 191e01fe2cae54072a240481ec6c7a8205f9efc0 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 18 Dec 2020 21:06:21 +0100 Subject: [freetype] avoid target_link_libraries call since qt6 does not like it. (#15112) --- ports/freetype/CONTROL | 2 +- ports/freetype/vcpkg-cmake-wrapper.cmake | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/freetype/CONTROL b/ports/freetype/CONTROL index 55358c608..c005318a2 100644 --- a/ports/freetype/CONTROL +++ b/ports/freetype/CONTROL @@ -1,6 +1,6 @@ Source: freetype Version: 2.10.2 -Port-Version: 6 +Port-Version: 7 Homepage: https://www.freetype.org/ Description: A library to render fonts. Default-Features: zlib, bzip2, png, brotli diff --git a/ports/freetype/vcpkg-cmake-wrapper.cmake b/ports/freetype/vcpkg-cmake-wrapper.cmake index 42bf9e1fa..2f4656bf1 100644 --- a/ports/freetype/vcpkg-cmake-wrapper.cmake +++ b/ports/freetype/vcpkg-cmake-wrapper.cmake @@ -34,9 +34,15 @@ if(TARGET Freetype::Freetype) if(@USE_PNG@) set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES PNG::PNG) endif() - if(@USE_BROTLI@) - target_link_libraries(Freetype::Freetype INTERFACE ${BROTLIDEC_LIBRARIES} ${BROTLICOMMON_LIBRARIES}) + if(BROTLIDEC_LIBRARY_DEBUG) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$:${BROTLIDEC_LIBRARY_DEBUG}>) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$:${BROTLICOMMON_LIBRARY_DEBUG}>) + endif() + if(BROTLIDEC_LIBRARY_RELEASE) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$>:${BROTLIDEC_LIBRARY_RELEASE}>) + set_property(TARGET Freetype::Freetype APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$>:${BROTLICOMMON_LIBRARY_RELEASE}>) + endif() endif() endif() -- cgit v1.2.3