[springlobby] 26/28: Add FindJsoncpp.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository springlobby.

commit 2d5a492e1fb076fa461f9703f8092796c784fd04
Author: Markus Koschany <apo at debian.org>
Date:   Mon Apr 11 05:22:38 2016 +0200

    Add FindJsoncpp.patch
---
 debian/patches/FindJsoncpp.patch | 36 ++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/FindJsoncpp.patch b/debian/patches/FindJsoncpp.patch
new file mode 100644
index 0000000..a07561a
--- /dev/null
+++ b/debian/patches/FindJsoncpp.patch
@@ -0,0 +1,36 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 11 Apr 2016 05:22:24 +0200
+Subject: FindJsoncpp
+
+---
+ src/lsl/CMakeLists.txt | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/src/lsl/CMakeLists.txt b/src/lsl/CMakeLists.txt
+index 365cdf7..8b1d4bb 100644
+--- a/src/lsl/CMakeLists.txt
++++ b/src/lsl/CMakeLists.txt
+@@ -137,7 +137,22 @@ if (LSL_JSONCPP_INTERNAL)
+ 		${CMAKE_CURRENT_SOURCE_DIR}/lib/jsoncpp/src/lib_json/json_writer.cpp
+ 	)
+ else()
+-        find_package(Jsoncpp REQUIRED)
++INCLUDE(FindPkgConfig)
++if(PKG_CONFIG_FOUND)
++	pkg_check_modules(Jsoncpp_PKGCONF jsoncpp)
++endif()
++# Include dir
++find_path(Jsoncpp_INCLUDE_DIR
++  NAMES json/features.h
++  PATH_SUFFIXES jsoncpp
++  PATHS ${Jsoncpp_PKGCONF_INCLUDE_DIRS} # /usr/include/jsoncpp/json
++)
++
++# Finally the library itself
++find_library(Jsoncpp_LIBRARY
++  NAMES jsoncpp
++  PATHS ${Jsoncpp_PKGCONF_LIBRARY_DIRS}
++)
+ endif()
+ 
+ add_subdirectory( src )
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8a1e79c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+FindJsoncpp.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/springlobby.git