projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blobmsg: add blobmsg_realloc_string_buffer()
[project/libubox.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
b756247
..
ba7ccaa
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-25,9
+25,6
@@
IF(NOT HAVE_GETTIME)
ENDIF()
ENDIF()
ENDIF()
ENDIF()
-
-SET(CMAKE_INSTALL_PREFIX /usr)
-
FILE(GLOB headers *.h)
INSTALL(FILES ${headers}
DESTINATION include/libubox
FILE(GLOB headers *.h)
INSTALL(FILES ${headers}
DESTINATION include/libubox
@@
-38,13
+35,13
@@
INSTALL(TARGETS ubox
ADD_SUBDIRECTORY(lua)
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)
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)
ADD_EXECUTABLE(jshn jshn.c)
- TARGET_LINK_LIBRARIES(jshn
json
)
+ TARGET_LINK_LIBRARIES(jshn
${json}
)
INSTALL(TARGETS blobmsg_json jshn
LIBRARY DESTINATION lib
INSTALL(TARGETS blobmsg_json jshn
LIBRARY DESTINATION lib