From: Debian Multimedia Maintainers Date: Wed, 13 Jan 2021 12:47:55 +0000 (+0100) Subject: link applications against libpng/libjpeg/zlib X-Git-Tag: archive/raspbian/7.0.2_ds0-3+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=afa045a8820b0fab245a868a445b4a394d3a2f50;p=juce.git link applications against libpng/libjpeg/zlib Origin: Debian Forwarded: not-needed Last-Update: 2021-01-13 since we have stripped some libraries, we need to explicitly link against the system provided libraries Last-Update: 2022-11-10 Gbp-Pq: Name debian_buildcmake.patch --- diff --git a/extras/Build/CMake/JUCEModuleSupport.cmake b/extras/Build/CMake/JUCEModuleSupport.cmake index 555a72c4..1d9f8566 100644 --- a/extras/Build/CMake/JUCEModuleSupport.cmake +++ b/extras/Build/CMake/JUCEModuleSupport.cmake @@ -480,7 +480,7 @@ function(juce_add_module module_path) if(${module_name} STREQUAL "juce_core") _juce_add_standard_defs(${module_name}) - target_link_libraries(juce_core INTERFACE juce::juce_atomic_wrapper) + target_link_libraries(juce_core INTERFACE juce::juce_atomic_wrapper z) if(CMAKE_SYSTEM_NAME MATCHES ".*BSD") target_link_libraries(juce_core INTERFACE execinfo) diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake index 7f7c13b8..2f8cadf2 100644 --- a/extras/Build/CMake/JUCEUtils.cmake +++ b/extras/Build/CMake/JUCEUtils.cmake @@ -87,6 +87,7 @@ set_property(GLOBAL PROPERTY JUCE_COPY_PLUGIN_AFTER_BUILD FALSE) if((CMAKE_SYSTEM_NAME STREQUAL "Linux") OR (CMAKE_SYSTEM_NAME MATCHES ".*BSD")) _juce_create_pkgconfig_target(JUCE_CURL_LINUX_DEPS libcurl) _juce_create_pkgconfig_target(JUCE_BROWSER_LINUX_DEPS webkit2gtk-4.0 gtk+-x11-3.0) + _juce_create_pkgconfig_target(JUCE_IMG_LINUX_DEPS libpng libjpeg) elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin") find_program(JUCE_XCRUN xcrun) @@ -235,6 +236,8 @@ function(_juce_link_optional_libraries target) if(needs_browser) target_link_libraries(${target} PRIVATE juce::pkgconfig_JUCE_BROWSER_LINUX_DEPS) endif() + + target_link_libraries(${target} PRIVATE juce::pkgconfig_JUCE_IMG_LINUX_DEPS) elseif(APPLE) get_target_property(needs_storekit ${target} JUCE_NEEDS_STORE_KIT)