diff options
| author | Yousong Zhou <yszhou4tech@gmail.com> | 2014-11-12 16:59:14 +0300 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-12-11 19:56:54 +0300 |
| commit | cbf80de7f4df61960f386cb01a899cf4228d38f3 (patch) | |
| tree | 54820f6af0d9666e13220114e3897af05027eb52 /CMakeLists.txt | |
| parent | f09ae76445e32511433fdab0a1bcda73aa84986d (diff) | |
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 <peter@korsgaard.com>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files 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}) |