vcpkg/ports/ecm/fix_canberra.patch
Dawid Wróbel d0ce2aa08b
[kf5*] Update to 5.87 ()
* [kf5*] Update to 5.87

* [kf5*] Wrap paths in quotes

* [kf5*] Use current portfile spec

* [kf5*] Add missing PACKAGE_NAME where applicable

* [kf5config] use vcpkg_copy_tools to copy tools

* [kf5*] Install data files to a standard /share location

* [kf5sonnet] use vcpkg_copy_tools to copy tools

* [kf5*] no need to remove non-existent folders

* [kf5windowsystem] link against XCB when building statically

* [kf5dbusaddons] link against X11Extras when building statically

* [kf5syntaxhighlighting] handle /qml and /bin dirs

* [kf5*] KDE_INSTALL_QMLDIR instead moving by hand

* [kf5syntaxhighlighting] install kate-syntax-highlighter tool

* [kf5*] Formatting

* [kf5config] copy libexec tools to correct subfolders on *nix

* [kf5globalaccel] Make XCB XTEST optional requirement

* [kf5kio] Find LibMount when building statically

* [kf5kio] Revert blkid usage

221a94a66c

* [kf5*] Disable any doc leftovers

* [kf5*] update versions

* [kf5sonnet] don't build examples

* [kf5*] update versions

* [ecm] vcpkg-cmake-config dependency is extraneous

* [kf5kio] formatting

* [kf5*] update versions
2021-11-25 23:36:46 -08:00

40 lines
1.4 KiB
Diff

From 203c65c562453385e3ffc4485844b15e80b93107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= <me@dawidwrobel.com>
Date: Fri, 17 Sep 2021 00:07:08 +0200
Subject: [PATCH] FindCanberra: link against target provided by pkgconfig
target_link_libraries() against the target generated by
pkg_check_modules() so that the additional linker options are not
lost, such as the additional libraries to link against when
building statically.
BUG: 442555
---
find-modules/FindCanberra.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/find-modules/FindCanberra.cmake b/find-modules/FindCanberra.cmake
index c54adf99..f9561118 100644
--- a/find-modules/FindCanberra.cmake
+++ b/find-modules/FindCanberra.cmake
@@ -34,7 +34,7 @@ Since 5.56.0.
#]=======================================================================]
find_package(PkgConfig QUIET)
-pkg_check_modules(PC_Canberra libcanberra QUIET)
+pkg_check_modules(PC_Canberra IMPORTED_TARGET libcanberra QUIET)
find_library(Canberra_LIBRARIES
NAMES canberra
@@ -66,6 +66,7 @@ if(Canberra_FOUND AND NOT TARGET Canberra::Canberra)
INTERFACE_COMPILE_OPTIONS "${PC_Canberra_CFLAGS}"
INTERFACE_INCLUDE_DIRECTORIES "${Canberra_INCLUDE_DIRS}"
)
+ target_link_libraries(Canberra::Canberra INTERFACE PkgConfig::PC_Canberra)
endif()
mark_as_advanced(Canberra_LIBRARIES Canberra_INCLUDE_DIRS Canberra_VERSION)
--
GitLab