[SCM] libopenshot/master: use system libjsoncpp

ghisvail-guest at users.alioth.debian.org ghisvail-guest at users.alioth.debian.org
Sat Feb 4 14:39:32 UTC 2017


The following commit has been merged in the master branch:
commit b3c64005d5e4dd28dde2b4039268b6d94b22a8f8
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Dec 15 21:04:34 2016 +0000

    use system libjsoncpp

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 29fbe45..5d8b101 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -152,7 +152,13 @@ include_directories(${ZMQ_INCLUDE_DIRS})
 
 ################### JSONCPP #####################
 # Include jsoncpp headers (needed for JSON parsing)
-include_directories("../thirdparty/jsoncpp/include")
+if (USE_SYSTEM_JSONCPP)
+	find_package(JsonCpp REQUIRED)
+	include_directories(${JSONCPP_INCLUDE_DIRS})
+else ()
+	message("Using embedded JsonCpp")
+	include_directories("../thirdparty/jsoncpp/include")
+endif ()
 
 IF (NOT DISABLE_TESTS)
 	###############  SET TEST SOURCE FILES  #################

-- 
libopenshot packaging



More information about the pkg-multimedia-commits mailing list