X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=CMakeLists.txt;h=f24fee9b6d67eae0a043cb1eb25d43d1f3e2c5ab;hb=dffbc09baf71b294185a36048166d00066d433b5;hp=1b7fac2d799b28739eaf84a8ed706b21212cf843;hpb=e8b26ce48d9a423507d2cb6b98094fe5adb1ed9c;p=project%2Flibubox.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b7fac2..f24fee9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,9 +19,11 @@ IF(JSONC_FOUND) 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) +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) @@ -36,7 +38,8 @@ FILE(GLOB headers *.h) INSTALL(FILES ${headers} DESTINATION include/libubox ) -INSTALL(TARGETS ubox +INSTALL(TARGETS ubox ubox-static + ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) @@ -48,7 +51,7 @@ IF(EXISTS ${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)