From fc7bbb9fa53ebe6fda7b0a2b9d76c9009cc3ca2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Tue, 14 Dec 2021 17:24:14 +0100 Subject: [PATCH] Fix paths in installed cmake snippets --- debian/patches/debian_cmake.patch | 42 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 43 insertions(+) create mode 100644 debian/patches/debian_cmake.patch diff --git a/debian/patches/debian_cmake.patch b/debian/patches/debian_cmake.patch new file mode 100644 index 00000000..8b1cad1f --- /dev/null +++ b/debian/patches/debian_cmake.patch @@ -0,0 +1,42 @@ +Description: adjust paths in installed CMake snippets +Author: IOhannes m zmölnig +Origin: Debian +Forwarded: not-needed +Last-Update: 2021-12-14 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- juce.orig/extras/Build/CMake/JUCEConfig.cmake.in ++++ juce/extras/Build/CMake/JUCEConfig.cmake.in +@@ -20,6 +20,8 @@ + + @PACKAGE_INIT@ + ++set(PACKAGE_PREFIX_DIR "@CMAKE_INSTALL_PREFIX@") ++ + if(NOT TARGET juce::juceaide) + add_executable(juce::juceaide IMPORTED) + set_target_properties(juce::juceaide PROPERTIES +@@ -28,11 +30,11 @@ + + 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 +@@ -84,7 +86,7 @@ + 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) diff --git a/debian/patches/series b/debian/patches/series index 442a4dca..15858140 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -9,3 +9,4 @@ debian_link_systemlibs.patch cross.patch debian_buildcmake.patch overridable_pkg-config.patch +debian_cmake.patch -- 2.30.2