uloop: Remove uloop_cancelled variable, it is not used anywhere

[project/libubox.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bcec18..f24fee9 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,18 @@ 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})
+ADD_LIBRARY(ubox-static STATIC ${SOURCES})
+SET_TARGET_PROPERTIES(ubox-static PROPERTIES OUTPUT_NAME ubox)
 
 SET(LIBS)
 CHECK_FUNCTION_EXISTS(clock_gettime HAVE_GETTIME)
@@ -29,21 +38,25 @@ FILE(GLOB headers *.h)
 INSTALL(FILES ${headers}
        DESTINATION include/libubox
 )
-INSTALL(TARGETS ubox
+INSTALL(TARGETS ubox ubox-static
+       ARCHIVE DESTINATION lib
        LIBRARY DESTINATION lib
 )
 
 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 blobmsg_json ${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
        )