json 0.12 fixes

[project/procd.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 92907fc7c6298c1708ab9aa74fd8ca10ea06959c..98395f5c64212b43a0d058592feb7d78265bd002 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,8 +14,7 @@ SET(SOURCES procd.c signal.c watchdog.c state.c       inittab.c rcS.c ubus.c system.c
        service/service.c service/instance.c service/validate.c service/trigger.c service/watch.c
        plug/coldplug.c plug/hotplug.c utils/utils.c)
 
-find_library(json NAMES json-c json)
-SET(LIBS ubox ubus ${json} blobmsg_json json_script)
+SET(LIBS ubox ubus json-c blobmsg_json json_script)
 
 IF(DEBUG)
   ADD_DEFINITIONS(-DDEBUG -g3)
@@ -26,7 +25,9 @@ IF(ZRAM_TMPFS)
   SET(SOURCES_ZRAM initd/zram.c)
 ENDIF()
 
-add_subdirectory(upgraded)
+IF(BUILD_UPGRADED)
+  add_subdirectory(upgraded)
+ENDIF()
 
 ADD_EXECUTABLE(procd ${SOURCES})
 TARGET_LINK_LIBRARIES(procd ${LIBS})