uci: fix memory leak in rpc_uci_replace_savedir()

[project/rpcd.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c0a4ef..ceb472e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,12 @@ cmake_minimum_required(VERSION 2.6)
 INCLUDE(CheckFunctionExists)
 
 PROJECT(rpcd C)
 INCLUDE(CheckFunctionExists)
 
 PROJECT(rpcd C)

-ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -Wmissing-declarations -Iinclude)
+ADD_DEFINITIONS(-Os -Wall -Werror --std=gnu99 -g3 -Wmissing-declarations)
+INCLUDE_DIRECTORIES(include)

 
 OPTION(FILE_SUPPORT "File plugin support" ON)
 OPTION(IWINFO_SUPPORT "libiwinfo plugin support" ON)
 
 OPTION(FILE_SUPPORT "File plugin support" ON)
 OPTION(IWINFO_SUPPORT "libiwinfo plugin support" ON)

+OPTION(RPCSYS_SUPPORT "rpc-sys plugin support" ON)

 
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 
 
 SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "")
 


@@ -22,10 +24,16 @@ ENDIF()
 
 FIND_LIBRARY(json NAMES json-c json)
 FIND_LIBRARY(crypt NAMES crypt)
 
 FIND_LIBRARY(json NAMES json-c json)
 FIND_LIBRARY(crypt NAMES crypt)

-IF(crypt STREQUAL "LIBS-NOTFOUND")
+IF(crypt STREQUAL "crypt-NOTFOUND")

   SET(crypt "")
 ENDIF()
 
   SET(crypt "")
 ENDIF()
 

+FIND_PATH(ubus_include_dir libubus.h)
+INCLUDE_DIRECTORIES(${ubus_include_dir})
+
+FIND_PATH(ubox_include_dir libubox/blobmsg_json.h)
+INCLUDE_DIRECTORIES(${ubox_include_dir})
+

 ADD_EXECUTABLE(rpcd main.c exec.c session.c uci.c plugin.c)
 TARGET_LINK_LIBRARIES(rpcd ubox ubus uci dl blobmsg_json ${json} ${crypt})
 
 ADD_EXECUTABLE(rpcd main.c exec.c session.c uci.c plugin.c)
 TARGET_LINK_LIBRARIES(rpcd ubox ubus uci dl blobmsg_json ${json} ${crypt})
 


@@ -38,6 +46,13 @@ IF(FILE_SUPPORT)
   SET_TARGET_PROPERTIES(file_plugin PROPERTIES OUTPUT_NAME file PREFIX "")
 ENDIF()
 
   SET_TARGET_PROPERTIES(file_plugin PROPERTIES OUTPUT_NAME file PREFIX "")
 ENDIF()
 

+IF(RPCSYS_SUPPORT)
+  SET(PLUGINS ${PLUGINS} rpcsys_plugin)
+  ADD_LIBRARY(rpcsys_plugin MODULE sys.c)
+  TARGET_LINK_LIBRARIES(rpcsys_plugin ubox ubus)
+  SET_TARGET_PROPERTIES(rpcsys_plugin PROPERTIES OUTPUT_NAME rpcsys PREFIX "")
+ENDIF()
+

 IF (IWINFO_SUPPORT)
   SET(PLUGINS ${PLUGINS} iwinfo_plugin)
   ADD_LIBRARY(iwinfo_plugin MODULE iwinfo.c)
 IF (IWINFO_SUPPORT)
   SET(PLUGINS ${PLUGINS} iwinfo_plugin)
   ADD_LIBRARY(iwinfo_plugin MODULE iwinfo.c)