DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add pkgconfig support for json-c

Browse source 
this includes a fallback for legacy support
This commit is contained in:
Thomas Gstädtner 2013-03-05 01:30:51 +01:00 committed by Felix Fietkau
parent b2010c706c
commit 49e6e062b8
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -12,6 +12,13 @@ IF(APPLE)
LINK_DIRECTORIES(/opt/local/lib) LINK_DIRECTORIES(/opt/local/lib)
ENDIF() ENDIF()
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(JSONC json)
IF(JSONC_FOUND)
ADD_DEFINITIONS(-DJSONC)
INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
ENDIF()
SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-fd.c vlist.c utils.c) SET(SOURCES avl.c avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-fd.c vlist.c utils.c)
ADD_LIBRARY(ubox SHARED ${SOURCES}) ADD_LIBRARY(ubox SHARED ${SOURCES})

5
blobmsg_json.h
View file

@ -16,7 +16,12 @@
#ifndef __BLOBMSG_JSON_H #ifndef __BLOBMSG_JSON_H
#define __BLOBMSG_JSON_H #define __BLOBMSG_JSON_H
#ifdef JSONC
#include <json.h>
#else
#include <json/json.h> #include <json/json.h>
#endif
#include <stdbool.h> #include <stdbool.h>
#include "blobmsg.h" #include "blobmsg.h"

5
jshn.c
View file

@ -13,7 +13,12 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef JSONC
#include <json.h>
#else
#include <json/json.h> #include <json/json.h>
#endif
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>