From cbf80de7f4df61960f386cb01a899cf4228d38f3 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 12 Nov 2014 21:59:14 +0800 Subject: [PATCH] libubox: drop legacy json-c support The cmake logic is wrong (E.G. PKG_CHECK_FOR_MODULES fails unless all modules are found), and the legacy libjson.so name is also used by the other libjson (http://sourceforge.net/projects/libjson/) which provides an incompatible API, so just drop it. Signed-off-by: Peter Korsgaard Signed-off-by: Yousong Zhou --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f24fee9..737f2ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ IF(APPLE) ENDIF() INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(JSONC json-c json) +PKG_CHECK_MODULES(JSONC json-c) IF(JSONC_FOUND) ADD_DEFINITIONS(-DJSONC) INCLUDE_DIRECTORIES(${JSONC_INCLUDE_DIRS}) @@ -45,7 +45,7 @@ INSTALL(TARGETS ubox ubox-static ADD_SUBDIRECTORY(lua) -find_library(json NAMES json-c json) +find_library(json NAMES json-c) IF(EXISTS ${json}) ADD_LIBRARY(blobmsg_json SHARED blobmsg_json.c) TARGET_LINK_LIBRARIES(blobmsg_json ubox ${json})