fill padding bytes when setting raw attribute length

[project/libubox.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ae4ff17..2729150 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.6)
 
 PROJECT(ubox C)
 ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3)
@@ -8,12 +8,9 @@ IF(APPLE)
   LINK_DIRECTORIES(/opt/local/lib)
 ENDIF()
 
-SET(SOURCES avl.c blob.c blobmsg.c hash.c uhtbl.c uloop.c usock.c)
+SET(SOURCES avl.c blob.c blobmsg.c uloop.c usock.c)
 
 ADD_LIBRARY(ubox SHARED ${SOURCES})
-ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
-
-TARGET_LINK_LIBRARIES(blobmsg_json ubox json)
 
 SET(CMAKE_INSTALL_PREFIX /usr)
 
@@ -21,6 +18,26 @@ FILE(GLOB headers *.h)
 INSTALL(FILES ${headers}
        DESTINATION include/libubox
 )
-INSTALL(TARGETS ubox blobmsg_json
+INSTALL(TARGETS ubox
        LIBRARY DESTINATION lib
 )
+
+find_library(json json)
+IF(EXISTS ${json})
+       ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
+       TARGET_LINK_LIBRARIES(blobmsg_json ubox json)
+
+       ADD_EXECUTABLE(jshn jshn.c)
+       TARGET_LINK_LIBRARIES(jshn json)
+
+       INSTALL(TARGETS blobmsg_json jshn
+               LIBRARY DESTINATION lib
+               RUNTIME DESTINATION bin
+       )
+
+       FILE(GLOB scripts sh/*.sh)
+       INSTALL(FILES ${scripts}
+               DESTINATION share/libubox
+       )
+
+ENDIF()