projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jshn: shorten JSON_VAR to J_V
[project/libubox.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
f8388ad
..
f24fee9
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-13,15
+13,17
@@
IF(APPLE)
ENDIF()
INCLUDE(FindPkgConfig)
ENDIF()
INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(JSONC json)
+PKG_CHECK_MODULES(JSONC json
-c json
)
IF(JSONC_FOUND)
ADD_DEFINITIONS(-DJSONC)
INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS})
ENDIF()
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
safe_list.c runqueue.c md5.c kvlist.c
)
ADD_LIBRARY(ubox SHARED ${SOURCES})
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)
SET(LIBS)
CHECK_FUNCTION_EXISTS(clock_gettime HAVE_GETTIME)
@@
-36,7
+38,8
@@
FILE(GLOB headers *.h)
INSTALL(FILES ${headers}
DESTINATION include/libubox
)
INSTALL(FILES ${headers}
DESTINATION include/libubox
)
-INSTALL(TARGETS ubox
+INSTALL(TARGETS ubox ubox-static
+ ARCHIVE DESTINATION lib
LIBRARY 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(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)
ADD_LIBRARY(json_script SHARED json_script.c)
TARGET_LINK_LIBRARIES(json_script ubox)