From 4fde955062433d76f0601e0cd86219ce0a2f908a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Sun, 29 Dec 2019 15:56:43 +0100 Subject: cmake: fix lookup of external libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In order to make it compile properly in more environments. Tested-by: Petr Novák Tested-by: Kuan-Yi Li Signed-off-by: Petr Štetiar --- CMakeLists.txt | 14 ++++++++++---- upgraded/CMakeLists.txt | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b3eebd..a566acd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,13 @@ IF(NOT DISABLE_INIT) SET(SOURCES ${SOURCES} watchdog.c plug/coldplug.c plug/hotplug.c) ENDIF() -SET(LIBS ubox ubus json-c blobmsg_json json_script) +FIND_LIBRARY(ubox NAMES ubox) +FIND_LIBRARY(ubus NAMES ubus) +FIND_LIBRARY(blobmsg_json NAMES blobmsg_json) +FIND_LIBRARY(json_script NAMES json_script) +FIND_LIBRARY(json NAMES json-c json) + +SET(LIBS ${ubox} ${ubus} ${json} ${blobmsg_json} ${json_script}) IF(DEBUG) ADD_DEFINITIONS(-DUDEV_DEBUG -g3) @@ -90,7 +96,7 @@ ADD_CUSTOM_TARGET(capabilities-names-h DEPENDS capabilities-names.h) IF(SECCOMP_SUPPORT) ADD_DEFINITIONS(-DSECCOMP_SUPPORT) ADD_LIBRARY(preload-seccomp SHARED jail/preload.c jail/seccomp.c) -TARGET_LINK_LIBRARIES(preload-seccomp dl ubox blobmsg_json) +TARGET_LINK_LIBRARIES(preload-seccomp dl ${ubox} ${blobmsg_json}) INSTALL(TARGETS preload-seccomp LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ) @@ -99,7 +105,7 @@ endif() IF(JAIL_SUPPORT) ADD_EXECUTABLE(ujail jail/jail.c jail/elf.c jail/fs.c jail/capabilities.c) -TARGET_LINK_LIBRARIES(ujail ubox blobmsg_json) +TARGET_LINK_LIBRARIES(ujail ${ubox} ${blobmsg_json}) INSTALL(TARGETS ujail RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) @@ -108,7 +114,7 @@ endif() IF(UTRACE_SUPPORT) ADD_EXECUTABLE(utrace trace/trace.c) -TARGET_LINK_LIBRARIES(utrace ubox ${json} blobmsg_json) +TARGET_LINK_LIBRARIES(utrace ${ubox} ${json} ${blobmsg_json}) INSTALL(TARGETS utrace RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR} ) diff --git a/upgraded/CMakeLists.txt b/upgraded/CMakeLists.txt index fd7d6bb..09cf472 100644 --- a/upgraded/CMakeLists.txt +++ b/upgraded/CMakeLists.txt @@ -5,7 +5,7 @@ FIND_PATH(ubox_include_dir libubox/uloop.h) INCLUDE_DIRECTORIES(${ubox_include_dir}) ADD_DEFINITIONS(-Os -ggdb -Wall -Werror --std=gnu99 -Wmissing-declarations) ADD_EXECUTABLE(upgraded upgraded.c ../watchdog.c) -TARGET_LINK_LIBRARIES(upgraded ubox) +TARGET_LINK_LIBRARIES(upgraded ${ubox}) INSTALL(TARGETS upgraded RUNTIME DESTINATION sbin ) -- cgit v1.2.1