[med-svn] [gatb-core] 01/01: Try to use Debian packaged jsoncpp but failed blatantly

[Andreas Tille]

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

tille pushed a commit to branch master
in repository gatb-core.

commit 947392f1b949cfae2e45685321858ed89c2cd40e
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 30 19:06:51 2017 +0100

    Try to use Debian packaged jsoncpp but failed blatantly
---
 debian/control                                   |  1 +
 debian/patches/series                            |  1 +
 debian/patches/use_debian_packaged_jsoncpp.patch | 24 ++++++++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/debian/control b/debian/control
index 8b799b2..8b71222 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 10),
                libcppunit-dev,
                libhdf5-dev,
                libboost-dev,
+               libjsoncpp-dev,
                doxygen,
                graphviz
 Standards-Version: 4.1.1
diff --git a/debian/patches/series b/debian/patches/series
index 8f6d780..00a6934 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 use_debian_packaged_hdf5.patch
 fix_hdf5_includes.patch
+use_debian_packaged_jsoncpp.patch
diff --git a/debian/patches/use_debian_packaged_jsoncpp.patch b/debian/patches/use_debian_packaged_jsoncpp.patch
new file mode 100644
index 0000000..3b7d34b
--- /dev/null
+++ b/debian/patches/use_debian_packaged_jsoncpp.patch
@@ -0,0 +1,24 @@
+--- a/gatb-core/thirdparty/CMakeLists.txt
++++ b/gatb-core/thirdparty/CMakeLists.txt
+@@ -35,20 +35,15 @@ set (COMPILE_DEFINITIONS  "${COMPILE_DEF
+ add_definitions (${COMPILE_DEFINITIONS})
+ 
+ # include other smaller libraries (json, Boophf)
++FIND_PACKAGE(JSONCPP COMPONENTS C REQUIRED)
+ 
+ add_custom_target (thirdparty_copy ALL)
+ add_custom_command (TARGET thirdparty_copy COMMAND ${CMAKE_COMMAND} -E
+-    make_directory ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/json)
+-add_custom_command (TARGET thirdparty_copy COMMAND ${CMAKE_COMMAND} -E
+     make_directory ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/BooPHF)
+ add_custom_command (TARGET thirdparty_copy  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/thirdparty/BooPHF/BooPHF.h ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/BooPHF/)
+-add_custom_command (TARGET thirdparty_copy  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${PROJECT_SOURCE_DIR}/thirdparty/json/json.hpp   ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/json/)
+-
+ ################################################################################
+ #  INSTALL 
+ ################################################################################
+ IF (NOT DEFINED GATB_CORE_INSTALL_EXCLUDE)
+-    INSTALL (DIRECTORY ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/hdf5 DESTINATION include)
+-    INSTALL (DIRECTORY ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/json DESTINATION include)
+     INSTALL (DIRECTORY ${PROJECT_BINARY_DIR}/include/${CMAKE_BUILD_TYPE}/BooPHF DESTINATION include)
+ ENDIF ()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gatb-core.git