From 32164d5e59f8adb7e0a247b8c8365b3b1e6ab3fe Mon Sep 17 00:00:00 2001 From: reuk Date: Mon, 9 Jan 2023 21:00:30 +0000 Subject: [PATCH] LV2 Client: Link juce_lv2_helper with pthread to ensure that threading is enabled in loaded plug-ins --- CMakeLists.txt | 7 +++++-- extras/Build/CMake/JUCEUtils.cmake | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cb7252c299..a6c6784852 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,10 @@ install(FILES "${JUCE_BINARY_DIR}/JUCEConfigVersion.cmake" if("${CMAKE_SOURCE_DIR}" STREQUAL "${JUCE_SOURCE_DIR}") _juce_add_lv2_manifest_helper_target() - install(TARGETS juce_lv2_helper EXPORT LV2_HELPER DESTINATION "bin/JUCE-${JUCE_VERSION}") - install(EXPORT LV2_HELPER NAMESPACE juce:: DESTINATION "${JUCE_INSTALL_DESTINATION}") + + if(TARGET juce_lv2_helper) + install(TARGETS juce_lv2_helper EXPORT LV2_HELPER DESTINATION "bin/JUCE-${JUCE_VERSION}") + install(EXPORT LV2_HELPER NAMESPACE juce:: DESTINATION "${JUCE_INSTALL_DESTINATION}") + endif() endif() diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake index 954a435db5..90f59fbf90 100644 --- a/extras/Build/CMake/JUCEUtils.cmake +++ b/extras/Build/CMake/JUCEUtils.cmake @@ -835,7 +835,7 @@ endfunction() # ================================================================================================== function(_juce_add_lv2_manifest_helper_target) - if(TARGET juce_lv2_helper) + if(TARGET juce_lv2_helper OR (CMAKE_SYSTEM_NAME STREQUAL "iOS") OR (CMAKE_SYSTEM_NAME STREQUAL "Android")) return() endif() @@ -846,6 +846,9 @@ function(_juce_add_lv2_manifest_helper_target) target_compile_features(juce_lv2_helper PRIVATE cxx_std_17) set_target_properties(juce_lv2_helper PROPERTIES BUILD_WITH_INSTALL_RPATH ON) target_link_libraries(juce_lv2_helper PRIVATE ${CMAKE_DL_LIBS}) + set(THREADS_PREFER_PTHREAD_FLAG ON) + find_package(Threads REQUIRED) + target_link_libraries(juce_lv2_helper PRIVATE Threads::Threads) endfunction() # ==================================================================================================