From: Florian Fainelli Date: Tue, 28 Mar 2017 00:10:57 +0000 (-0700) Subject: cmake: Make blockd link against libjson-c X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffstools.git;a=commitdiff_plain;h=20c16fc5fec00fdae547f083a822a7f1bd67d143 cmake: Make blockd link against libjson-c Similar to commit 35aa20c51995 ("cmake: Link against libjson-c"), blockd uses libblob_msg which needs libjson-c. Fixes: 98bbb5a068d6 ("blockd: add automounting support") Signed-off-by: Florian Fainelli --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 08d277f..a828244 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,12 +54,12 @@ ADD_EXECUTABLE(mount_root mount_root.c) TARGET_LINK_LIBRARIES(mount_root fstools) INSTALL(TARGETS mount_root RUNTIME DESTINATION sbin) +find_library(json NAMES json-c json) + ADD_EXECUTABLE(blockd blockd.c) -TARGET_LINK_LIBRARIES(blockd fstools ubus blobmsg_json) +TARGET_LINK_LIBRARIES(blockd fstools ubus blobmsg_json ${json}) INSTALL(TARGETS blockd RUNTIME DESTINATION sbin) -find_library(json NAMES json-c json) - ADD_EXECUTABLE(block block.c probe.c probe-libblkid.c) IF(DEFINED CMAKE_UBIFS_EXTROOT) ADD_DEFINITIONS(-DUBIFS_EXTROOT)