From 7dfb48ed5a35ac3ef20651fc0ad56e7ff00dff89 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Fri, 30 Aug 2019 18:41:47 +0200 Subject: [PATCH] [Qt5] Fix libpq linkage in wrapper (#7973) * PostgreSQL_LIBRARY will contain optimized/debug keywords which will not work in INTERFACE_LINK_LIBRARIES --- ports/qt5-base/CONTROL | 2 +- ports/qt5-base/vcpkg-cmake-wrapper.cmake | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 853215dc429..fb4b4a20055 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,5 +1,5 @@ Source: qt5-base -Version: 5.12.3-3 +Version: 5.12.3-4 Homepage: https://www.qt.io/ Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl diff --git a/ports/qt5-base/vcpkg-cmake-wrapper.cmake b/ports/qt5-base/vcpkg-cmake-wrapper.cmake index 8e00aaca7f9..81a434ffd5e 100644 --- a/ports/qt5-base/vcpkg-cmake-wrapper.cmake +++ b/ports/qt5-base/vcpkg-cmake-wrapper.cmake @@ -23,11 +23,12 @@ if("${_target_type}" STREQUAL "STATIC_LIBRARY") set_property(TARGET Qt5::Core APPEND PROPERTY INTERFACE_LINK_LIBRARIES ZLIB::ZLIB JPEG::JPEG PNG::PNG Freetype::Freetype sqlite3 harfbuzz::harfbuzz - ${PostgreSQL_LIBRARY} double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto + double-conversion::double-conversion OpenSSL::SSL OpenSSL::Crypto ) add_qt_library(Qt5::Core pcre2-16 + libpq Qt5ThemeSupport Qt5EventDispatcherSupport Qt5PlatformCompositorSupport