From fa0bf4ef45b122b21bea2397d10c47f8f874cb7f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Tue, 17 Sep 2019 15:31:08 +0200 Subject: [PATCH] cmake: add proper include and library dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Otherwise it's not possible to compile it properly if the dependencies are not installed in the standard include/libraries paths. Signed-off-by: Petr Å tetiar --- CMakeLists.txt | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c81184..14888ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,13 @@ ADD_DEFINITIONS(-Os -ggdb -Wall --std=gnu99 -Wmissing-declarations) SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") -find_library(json NAMES json-c json) +FIND_PATH(ubox_include_dir NAMES libubox/usock.h) +FIND_PATH(jsonc_include_dir NAMES json-c/json.h) +INCLUDE_DIRECTORIES(${ubox_include_dir} ${jsonc_include_dir}) + +FIND_LIBRARY(ubox NAMES ubox) +FIND_LIBRARY(blobmsg_json NAMES blobmsg_json) +FIND_LIBRARY(json NAMES json-c json) IF(UCERT_HOST_BUILD) ADD_DEFINITIONS(-DUCERT_HOST_BUILD) @@ -19,10 +25,10 @@ ENDIF() ADD_EXECUTABLE(ucert ucert.c usign-exec.c) IF(UCERT_FULL) ADD_DEFINITIONS(-DUCERT_FULL) -TARGET_LINK_LIBRARIES(ucert ubox blobmsg_json ${json}) +TARGET_LINK_LIBRARIES(ucert ${ubox} ${blobmsg_json} ${json}) ELSE() ADD_DEFINITIONS(-DUCERT_STRIP_MESSAGES) -TARGET_LINK_LIBRARIES(ucert ubox) +TARGET_LINK_LIBRARIES(ucert ${ubox}) ENDIF() INSTALL(TARGETS ucert RUNTIME DESTINATION bin) -- 2.25.1