remove uhtbl - i don't think we will need it

[project/libubox.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 752a7bf..699ae95 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,16 +3,17 @@ cmake_minimum_required(VERSION 2.8)
 PROJECT(ubox C)
 ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3)
 
-SET(SOURCES avl.c blob.c blobmsg.c hash.c uhtbl.c uloop.c)
-IF("${CMAKE_SYSTEM}" MATCHES "Linux")
-  SET(SOURCES ${SOURCES} unl.c)
-ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux")
+IF(APPLE)
+  INCLUDE_DIRECTORIES(/opt/local/include)
+  LINK_DIRECTORIES(/opt/local/lib)
+ENDIF()
+
+SET(SOURCES avl.c blob.c blobmsg.c hash.c uloop.c usock.c)
 
 ADD_LIBRARY(ubox SHARED ${SOURCES})
+ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c)
 
-IF("${CMAKE_SYSTEM}" MATCHES "Linux")
-  TARGET_LINK_LIBRARIES(ubox nl-tiny)
-ENDIF("${CMAKE_SYSTEM}" MATCHES "Linux")
+TARGET_LINK_LIBRARIES(blobmsg_json ubox json)
 
 SET(CMAKE_INSTALL_PREFIX /usr)
 
@@ -20,6 +21,6 @@ FILE(GLOB headers *.h)
 INSTALL(FILES ${headers}
        DESTINATION include/libubox
 )
-INSTALL(TARGETS ubox
+INSTALL(TARGETS ubox blobmsg_json
        LIBRARY DESTINATION lib
 )