[neon/backports-jammy/cppdap/Neon/release] debian/patches: Work around bug in libjsoncpp CMake config

[Carlos De Maine]

Git commit 63bfd478d0d5c3eeeb4623d4216c503bd530a1f9 by Carlos De Maine, on behalf of Timo Röhling.
Committed on 17/08/2023 at 01:39.
Pushed by carlosdem into branch 'Neon/release'.

Work around bug in libjsoncpp CMake config

(cherry picked from commit c4170f2bb4d3bde05d048bd058402e436f30f6de)

M  +11   -7    debian/patches/0003-Export-jsoncpp-link.patch

https://invent.kde.org/neon/backports-jammy/cppdap/-/commit/63bfd478d0d5c3eeeb4623d4216c503bd530a1f9

diff --git a/debian/patches/0003-Export-jsoncpp-link.patch b/debian/patches/0003-Export-jsoncpp-link.patch
index 2c987e8..e690077 100644
--- a/debian/patches/0003-Export-jsoncpp-link.patch
+++ b/debian/patches/0003-Export-jsoncpp-link.patch
@@ -3,19 +3,23 @@ Date: Sun, 2 Jul 2023 23:00:01 +0200
 Subject: Export jsoncpp link
 
 ---
- cmake/Config.cmake.in | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
+ cmake/Config.cmake.in | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
 
 diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
-index 384aa3f..6d6ee37 100644
+index 384aa3f..04c4357 100644
 --- a/cmake/Config.cmake.in
 +++ b/cmake/Config.cmake.in
-@@ -14,12 +14,8 @@
+@@ -13,13 +13,10 @@
+ # limitations under the License.
  
  @PACKAGE_INIT@
- include(CMakeFindDependencyMacro)
-+find_dependency(jsoncpp)
- 
+-include(CMakeFindDependencyMacro)
+-
++if(NOT TARGET JsonCpp::JsonCpp)
++    include(CMakeFindDependencyMacro)
++    find_dependency(jsoncpp)
++endif()
  include("${CMAKE_CURRENT_LIST_DIR}/@CPPDAP_TARGETS_EXPORT_NAME at .cmake")
  check_required_components("@CPPDAP_TARGET_NAME@")