X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=54c5cf26f7ba8e5a6bc1aef8f36b367b841ec3ee;hb=16efed543212c44e1d8af01a2471801792c0a32d;hp=0857d4e76c9b9e7375a365a4f224063d3096a079;hpb=b298632b93c963a74dda7b2d149d7d93bc8734e8;p=project%2Fuci.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0857d4e..54c5cf2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(uci C)
 
 SET(CMAKE_INSTALL_PREFIX /usr)
 
-ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -DUCI_PREFIX="${CMAKE_INSTALL_PREFIX}")
+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)
@@ -13,29 +13,32 @@ OPTION(BUILD_LUA "build Lua plugin" ON)
 
 CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/uci_config.h.in ${CMAKE_SOURCE_DIR}/uci_config.h )
 
-SET(LIB_SOURCES libuci.c file.c ucimap.c util.c delta.c)
+SET(LIB_SOURCES libuci.c file.c util.c delta.c parse.c)
 
 ADD_LIBRARY(uci-shared SHARED ${LIB_SOURCES})
 SET_TARGET_PROPERTIES(uci-shared PROPERTIES OUTPUT_NAME uci)
+TARGET_LINK_LIBRARIES(uci-shared dl)
 
 ADD_LIBRARY(uci-static STATIC ${LIB_SOURCES})
 SET_TARGET_PROPERTIES(uci-static PROPERTIES OUTPUT_NAME uci)
 
 ADD_EXECUTABLE(cli cli.c)
 SET_TARGET_PROPERTIES(cli PROPERTIES OUTPUT_NAME uci)
-TARGET_LINK_LIBRARIES(cli uci-shared)
+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)
+TARGET_LINK_LIBRARIES(cli-static uci-static dl)
+
+ADD_LIBRARY(ucimap STATIC ucimap.c)
 
 ADD_EXECUTABLE(ucimap-example ucimap-example.c)
-TARGET_LINK_LIBRARIES(ucimap-example uci-static)
+TARGET_LINK_LIBRARIES(ucimap-example uci-static ucimap dl)
 
 ADD_SUBDIRECTORY(lua)
 
 INSTALL(FILES uci.h uci_config.h ucimap.h
-	DESTINATION include/libubox
+	DESTINATION include
 )
 
 INSTALL(TARGETS uci-shared uci-static cli cli-static