blobmsg_json: let blobmsg_format_json_with_cb with list == true also format arrays

[project/libubox.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba7ccaa..c339e02 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,14 @@ IF(APPLE)
   LINK_DIRECTORIES(/opt/local/lib)
 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)
+INCLUDE(FindPkgConfig)
+PKG_CHECK_MODULES(JSONC json-c 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 safe_list.c runqueue.c md5.c kvlist.c)
 
 ADD_LIBRARY(ubox SHARED ${SOURCES})
 
@@ -43,7 +50,10 @@ IF(EXISTS ${json})
        ADD_EXECUTABLE(jshn jshn.c)
        TARGET_LINK_LIBRARIES(jshn ${json})
 
-       INSTALL(TARGETS blobmsg_json jshn
+       ADD_LIBRARY(json_script SHARED json_script.c)
+       TARGET_LINK_LIBRARIES(json_script ubox)
+
+       INSTALL(TARGETS blobmsg_json jshn json_script
                LIBRARY DESTINATION lib
                RUNTIME DESTINATION bin
        )