From: Florian Fainelli Date: Fri, 1 Jul 2016 23:06:42 +0000 (-0700) Subject: cmake: Link against libjson-c X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=35aa20c51995e80257244790d4f058e15f29569f;p=oweals%2Ffstools.git cmake: Link against libjson-c block uses libblob_msgjson which requires us to link against libjson-c. Some external toolchains would be failing to find that library unless specified explicitly. Signed-off-by: Florian Fainelli --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a5a583..7db28c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,12 +53,14 @@ 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(block block.c) IF(DEFINED CMAKE_UBIFS_EXTROOT) ADD_DEFINITIONS(-DUBIFS_EXTROOT) - TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json ubi-utils) + TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json ubi-utils ${json}) ELSE(DEFINED CMAKE_UBIFS_EXTROOT) - TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json) + TARGET_LINK_LIBRARIES(block blkid-tiny uci ubox blobmsg_json ${json}) ENDIF(DEFINED CMAKE_UBIFS_EXTROOT) INSTALL(TARGETS block RUNTIME DESTINATION sbin)