From 5657e24bdc3efc0993e4f5219d5f5d000a4d40e3 Mon Sep 17 00:00:00 2001 From: Bjørn Mork Date: Sun, 21 Aug 2016 00:43:22 +0200 Subject: local: make sure uqmi works with libubox and json-c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Bjørn Mork cmake: no need for the json-c dependency Signed-off-by: Bjørn Mork --- CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98d7d75..5c41098 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,20 +12,17 @@ SET(SOURCES main.c dev.c commands.c qmi-message.c mbim.c) FIND_PATH(ubox_include_dir libubox/usock.h) FIND_PATH(blobmsg_json_include_dir libubox/blobmsg_json.h) -FIND_PATH(json_include_dir json-c/json.h json/json.h json.h) -INCLUDE_DIRECTORIES(${ubox_include_dir} ${blobmsg_json_include_dir} ${json_include_dir}) +INCLUDE_DIRECTORIES(${ubox_include_dir} ${blobmsg_json_include_dir}) IF(BUILD_STATIC) - FIND_LIBRARY(json_library NAMES libjson.a libjson-c.a) FIND_LIBRARY(blobmsg_json_library NAMES libblobmsg_json.a) FIND_LIBRARY(ubox_library NAMES libubox.a) ELSE(BUILD_STATIC) - FIND_LIBRARY(json_library NAMES json-c json) FIND_LIBRARY(blobmsg_json_library NAMES blobmsg_json) FIND_LIBRARY(ubox_library NAMES ubox) ENDIF(BUILD_STATIC) -SET(LIBS ${ubox_library} ${blobmsg_json_library} ${json_library}) +SET(LIBS ${ubox_library} ${blobmsg_json_library}) IF(DEBUG_PACKET) ADD_DEFINITIONS(-DDEBUG_PACKET) -- cgit v1.2.3