projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
jshn: introduce json_is_a() convenience function to check field types without using...
[project/libubox.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
9e8f093
..
00b3b41
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-1,14
+1,16
@@
cmake_minimum_required(VERSION 2.6)
PROJECT(ubox C)
cmake_minimum_required(VERSION 2.6)
PROJECT(ubox C)
-ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3)
+ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -Wmissing-declarations)
+
+OPTION(BUILD_LUA "build Lua plugin" ON)
IF(APPLE)
INCLUDE_DIRECTORIES(/opt/local/include)
LINK_DIRECTORIES(/opt/local/lib)
ENDIF()
IF(APPLE)
INCLUDE_DIRECTORIES(/opt/local/include)
LINK_DIRECTORIES(/opt/local/lib)
ENDIF()
-SET(SOURCES avl.c
blob.c blobmsg.c uloop.c usock
.c)
+SET(SOURCES avl.c
avl-cmp.c blob.c blobmsg.c uloop.c usock.c ustream.c ustream-fd.c vlist
.c)
ADD_LIBRARY(ubox SHARED ${SOURCES})
ADD_LIBRARY(ubox SHARED ${SOURCES})
@@
-22,11
+24,24
@@
INSTALL(TARGETS ubox
LIBRARY DESTINATION lib
)
LIBRARY DESTINATION lib
)
+ADD_SUBDIRECTORY(lua)
+
find_library(json json)
IF(EXISTS ${json})
ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
TARGET_LINK_LIBRARIES(blobmsg_json ubox json)
find_library(json json)
IF(EXISTS ${json})
ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
TARGET_LINK_LIBRARIES(blobmsg_json ubox json)
- INSTALL(TARGETS blobmsg_json
+
+ ADD_EXECUTABLE(jshn jshn.c)
+ TARGET_LINK_LIBRARIES(jshn json)
+
+ INSTALL(TARGETS blobmsg_json jshn
LIBRARY DESTINATION lib
LIBRARY DESTINATION lib
+ RUNTIME DESTINATION bin
)
)
+
+ FILE(GLOB scripts sh/*.sh)
+ INSTALL(FILES ${scripts}
+ DESTINATION share/libubox
+ )
+
ENDIF()
ENDIF()