X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=CMakeLists.txt;h=e846ceb3171253716b23b7375596aa65daf6ad55;hp=7df3be9ec6bfc952daa3632be9cbd14373a0e1c4;hb=9d8e1fe4857c1c3e8f1a2e2ae59ef9c4790adb39;hpb=5b6e96336d6a615a72c274cceaea8c2fe74d7642

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7df3be9..e846ceb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,46 +2,39 @@ cmake_minimum_required(VERSION 2.6)
 
 PROJECT(uci C)
 
-SET(CMAKE_INSTALL_PREFIX /usr)
-
+SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -I. -DUCI_PREFIX="${CMAKE_INSTALL_PREFIX}")
 
-OPTION(UCI_PLUGIN_SUPPORT "plugin support" ON)
 OPTION(UCI_DEBUG "debugging support" OFF)
 OPTION(UCI_DEBUG_TYPECAST "typecast debugging support" OFF)
-OPTION(BUILD_LUA "build Lua plugin" ON)
+OPTION(BUILD_LUA "build Lua binding" ON)
 
 CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/uci_config.h.in ${CMAKE_SOURCE_DIR}/uci_config.h )
 
-SET(LIB_SOURCES libuci.c file.c util.c delta.c)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-ADD_LIBRARY(uci-shared SHARED ${LIB_SOURCES})
-SET_TARGET_PROPERTIES(uci-shared PROPERTIES OUTPUT_NAME uci)
-TARGET_LINK_LIBRARIES(uci-shared dl)
+SET(LIB_SOURCES libuci.c file.c util.c delta.c parse.c blob.c)
 
-ADD_LIBRARY(uci-static STATIC ${LIB_SOURCES})
-SET_TARGET_PROPERTIES(uci-static PROPERTIES OUTPUT_NAME uci)
+ADD_LIBRARY(uci SHARED ${LIB_SOURCES})
+TARGET_LINK_LIBRARIES(uci ubox)
+SET_TARGET_PROPERTIES(uci PROPERTIES OUTPUT_NAME uci)
 
 ADD_EXECUTABLE(cli cli.c)
 SET_TARGET_PROPERTIES(cli PROPERTIES OUTPUT_NAME uci)
-TARGET_LINK_LIBRARIES(cli uci-shared dl)
-
-ADD_EXECUTABLE(cli-static cli.c)
-SET_TARGET_PROPERTIES(cli-static PROPERTIES OUTPUT_NAME uci-static)
-TARGET_LINK_LIBRARIES(cli-static uci-static dl)
+TARGET_LINK_LIBRARIES(cli uci)
 
 ADD_LIBRARY(ucimap STATIC ucimap.c)
 
 ADD_EXECUTABLE(ucimap-example ucimap-example.c)
-TARGET_LINK_LIBRARIES(ucimap-example uci-static ucimap dl)
+TARGET_LINK_LIBRARIES(ucimap-example uci ucimap)
 
 ADD_SUBDIRECTORY(lua)
 
-INSTALL(FILES uci.h uci_config.h ucimap.h
+INSTALL(FILES uci.h uci_config.h uci_blob.h ucimap.h
 	DESTINATION include
 )
 
-INSTALL(TARGETS uci-shared uci-static cli cli-static
+INSTALL(TARGETS uci cli
 	ARCHIVE DESTINATION lib
 	LIBRARY DESTINATION lib
 	RUNTIME DESTINATION bin