From: Debian Multimedia Maintainers Date: Thu, 4 Aug 2022 20:02:56 +0000 (+0200) Subject: adjust paths in installed CMake snippets X-Git-Tag: archive/raspbian/7.0.1_ds0-1+rpi1^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=47a1f5e404011854c021bf6c6a416713d043b087;p=juce.git adjust paths in installed CMake snippets Origin: Debian Forwarded: not-needed Last-Update: 2021-12-14 Last-Update: 2021-12-14 Gbp-Pq: Name debian_cmake.patch --- diff --git a/extras/Build/CMake/JUCEConfig.cmake.in b/extras/Build/CMake/JUCEConfig.cmake.in index 6a96e24e..0dec9b79 100644 --- a/extras/Build/CMake/JUCEConfig.cmake.in +++ b/extras/Build/CMake/JUCEConfig.cmake.in @@ -22,6 +22,8 @@ include("${CMAKE_CURRENT_LIST_DIR}/LV2_HELPER.cmake") +set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@") + if(NOT TARGET juce::juceaide) add_executable(juce::juceaide IMPORTED) set_target_properties(juce::juceaide PROPERTIES @@ -30,11 +32,11 @@ endif() check_required_components("@PROJECT_NAME@") -set(JUCE_MODULES_DIR "@PACKAGE_JUCE_MODULE_PATH@" CACHE INTERNAL +set(JUCE_MODULES_DIR "/usr/share/juce/modules" CACHE INTERNAL "The path to JUCE modules") -include("@PACKAGE_UTILS_INSTALL_DIR@/JUCEModuleSupport.cmake") -include("@PACKAGE_UTILS_INSTALL_DIR@/JUCEUtils.cmake") +include("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/JUCE-@JUCE_VERSION@/JUCEModuleSupport.cmake") +include("@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/cmake/JUCE-@JUCE_VERSION@/JUCEUtils.cmake") set(_juce_modules juce_analytics @@ -86,7 +88,7 @@ unset(_targets_defined) unset(_targets_expected) foreach(_juce_module IN LISTS _juce_modules) - juce_add_module("@PACKAGE_JUCE_MODULE_PATH@/${_juce_module}" ALIAS_NAMESPACE juce) + juce_add_module("/usr/share/juce/modules/${_juce_module}" ALIAS_NAMESPACE juce) endforeach() unset(_juce_modules)