X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=CMakeLists.txt;h=015b8bd64f21a03a3b93dddd9f3fd6d6c1fe0b3e;hp=b75624774e81327ffdcf2d8ee35a5e35cb8d7a5a;hb=ecee1a3bea109c50964355becdce16edaafc6151;hpb=dde64e47cadbd245a99f145869eb400b68cc82e9

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b756247..015b8bd 100644
--- 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)
 
 ADD_LIBRARY(ubox SHARED ${SOURCES})
 
@@ -25,9 +32,6 @@ IF(NOT HAVE_GETTIME)
 	ENDIF()
 ENDIF()
 
-
-SET(CMAKE_INSTALL_PREFIX /usr)
-
 FILE(GLOB headers *.h)
 INSTALL(FILES ${headers}
 	DESTINATION include/libubox
@@ -38,15 +42,18 @@ INSTALL(TARGETS ubox
 
 ADD_SUBDIRECTORY(lua)
 
-find_library(json json)
+find_library(json NAMES json-c json)
 IF(EXISTS ${json})
 	ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
-	TARGET_LINK_LIBRARIES(blobmsg_json ubox json)
+	TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json})
 
 	ADD_EXECUTABLE(jshn jshn.c)
-	TARGET_LINK_LIBRARIES(jshn json)
+	TARGET_LINK_LIBRARIES(jshn ${json})
+
+	ADD_LIBRARY(json_script SHARED json_script.c)
+	TARGET_LINK_LIBRARIES(json_script ubox)
 
-	INSTALL(TARGETS blobmsg_json jshn
+	INSTALL(TARGETS blobmsg_json jshn json_script
 		LIBRARY DESTINATION lib
 		RUNTIME DESTINATION bin
 	)