diff --git a/configure.ac b/configure.ac index 5a202d0a32aa1817c2154ec984a85dd12b848a89..f55779c00669eb02b53731b86ef3316748048b6b 100644 --- a/configure.ac +++ b/configure.ac @@ -260,6 +260,7 @@ dnl Check for pjproject PKG_CHECK_MODULES(PJPROJECT, libpjproject,, AC_MSG_ERROR([Missing pjproject files])) PKG_CHECK_MODULES([YAMLCPP], [yaml-cpp >= 0.5.1],, AC_MSG_ERROR([yaml-cpp not found])) +PKG_CHECK_MODULES([JSONCPP], [jsoncpp >= 1.6.5],, AC_MSG_ERROR([jsoncpp not found])) if test "${HAVE_ANDROID}" = "1"; then dnl Check for OpenSL diff --git a/contrib/src/jsoncpp/SHA512SUMS b/contrib/src/jsoncpp/SHA512SUMS new file mode 100644 index 0000000000000000000000000000000000000000..614157b75c53f1b57b069cf75eb70570379ce2f2 --- /dev/null +++ b/contrib/src/jsoncpp/SHA512SUMS @@ -0,0 +1 @@ +589153d525ffde15e10f1ef6907c6b5d0f62a41c8cebdc12fe2bc4d989bcd861cdac79526de2f51872c0a17e574bf0fd8c913f0aa301c184efa1e3f2fb2b1955 jsoncpp-1.6.5.tar.gz diff --git a/contrib/src/jsoncpp/rules.mak b/contrib/src/jsoncpp/rules.mak new file mode 100644 index 0000000000000000000000000000000000000000..35186d707a2d2a2f439b5f006370b674f835f834 --- /dev/null +++ b/contrib/src/jsoncpp/rules.mak @@ -0,0 +1,27 @@ +# JSONCPP +JSONCPP_VERSION := 1.6.5 +JSONCPP_URL := https://github.com/open-source-parsers/jsoncpp/archive/$(JSONCPP_VERSION).tar.gz + +PKGS += jsoncpp + +ifeq ($(call need_pkg,'jsoncpp'),) +PKGS_FOUND += jsoncpp +endif + +JSONCPP_CMAKECONF := -DBUILD_STATIC_LIBS:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DJSONCPP_WITH_TESTS:BOOL=OFF + +$(TARBALLS)/jsoncpp-$(JSONCPP_VERSION).tar.gz: + $(call download,$(JSONCPP_URL)) + +.sum-jsoncpp: jsoncpp-$(JSONCPP_VERSION).tar.gz + +jsoncpp: jsoncpp-$(JSONCPP_VERSION).tar.gz .sum-jsoncpp + $(UNPACK) + $(MOVE) + +.jsoncpp: jsoncpp toolchain.cmake + cd $< && $(HOSTVARS) $(CMAKE) . ${JSONCPP_CMAKECONF} + cd $< && $(MAKE) install + touch $@ diff --git a/src/Makefile.am b/src/Makefile.am index 3629dbcf73644ecd1f0588d0f6aa601eace08a79..52b19cd417b41e3a9c8d933e3577c79e0361e82d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,6 +73,7 @@ libring_la_LDFLAGS = \ @SAMPLERATE_LIBS@ \ @SNDFILE_LIBS@ \ @YAMLCPP_LIBS@ \ + @JSONCPP_LIBS@ \ @SPEEXDSP_LIBS@ \ @LIBUPNP_LIBS@ \ @PORTAUDIO_LIBS@ \