[pdal] 02/02: Use system jsoncpp only if version is >= 1.6.2.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository pdal.

commit 8a97f3c0d4bbf587b4d1eeffa49254333b0ec900
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 8 12:08:20 2016 +0200

    Use system jsoncpp only if version is >= 1.6.2.
---
 debian/changelog             | 1 +
 debian/patches/jsoncpp.patch | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e37f7f..d87aaa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pdal (1.2.0-1~exp2) UNRELEASED; urgency=medium
 
   * Add libsqlite3-mod-spatialite to libpdal-plugin-sqlite dependencies.
+  * Use system jsoncpp only if version is >= 1.6.2.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 02 Apr 2016 02:07:00 +0200
 
diff --git a/debian/patches/jsoncpp.patch b/debian/patches/jsoncpp.patch
index 9e0c075..c7ab562 100644
--- a/debian/patches/jsoncpp.patch
+++ b/debian/patches/jsoncpp.patch
@@ -4,14 +4,16 @@ Forwarded: https://github.com/PDAL/PDAL/pull/1211
 
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -101,9 +101,18 @@ set(PDAL_BASE_CPP
+@@ -101,9 +101,20 @@ set(PDAL_BASE_CPP
    ${PDAL_XML_SRC}
    ${PDAL_LAZPERF_SRC}
    ${DB_DRIVER_SRCS}
 -  ${PROJECT_SOURCE_DIR}/vendor/jsoncpp-1.6.2/dist/jsoncpp.cpp
  )
  
-+find_package(JSONCPP)
++include(FindPkgConfig)
++
++pkg_search_module(JSONCPP jsoncpp>=1.6.2)
 +if(JSONCPP_FOUND)
 +  include_directories(${JSONCPP_INCLUDE_DIR})
 +else(JSONCPP_FOUND)
@@ -24,7 +26,7 @@ Forwarded: https://github.com/PDAL/PDAL/pull/1211
  list (APPEND PDAL_CPP ${PDAL_BASE_CPP} )
  list (APPEND PDAL_HPP ${PDAL_BASE_HPP} )
  
-@@ -167,6 +176,10 @@ if (PDAL_HAVE_LIBXML2)
+@@ -167,6 +178,10 @@ if (PDAL_HAVE_LIBXML2)
      target_link_libraries(${PDAL_BASE_LIB_NAME} ${LIBXML2_LIBRARIES})
  endif()
  

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