From: Hauke Mehrtens Date: Fri, 1 Jan 2021 01:17:57 +0000 (+0100) Subject: cmake: use variables and find_library for dependency X-Git-Url: http://git.openwrt.org/?p=project%2Fuhttpd.git;a=commitdiff_plain;h=8ba0b640aed7df39f2ce6d4c2182207b3294849e cmake: use variables and find_library for dependency Use FIND_LIBRARY to search the dependency and use variables to reference them in the CMakeLists file. Signed-off-by: Hauke Mehrtens [ improve commit description ] Signed-off-by: Christian Marangi --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 564842d..58eb6dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,9 +36,13 @@ IF(HAVE_SHADOW) ADD_DEFINITIONS(-DHAVE_SHADOW) ENDIF() +FIND_LIBRARY(ubox NAMES ubox) +FIND_LIBRARY(json_script NAMES json_script) +FIND_LIBRARY(blobmsg_json NAMES blobmsg_json) + ADD_EXECUTABLE(uhttpd ${SOURCES}) FIND_LIBRARY(libjson NAMES json-c json) -TARGET_LINK_LIBRARIES(uhttpd ubox dl json_script blobmsg_json ${libjson} ${LIBS}) +TARGET_LINK_LIBRARIES(uhttpd ${ubox} dl ${json_script} ${blobmsg_json} ${libjson} ${LIBS}) SET(PLUGINS "") IF(LUA_SUPPORT) @@ -78,10 +82,11 @@ IF(UCODE_SUPPORT) ENDIF() IF(UBUS_SUPPORT) + FIND_LIBRARY(ubus NAMES ubus) SET(PLUGINS ${PLUGINS} uhttpd_ubus) ADD_DEFINITIONS(-DHAVE_UBUS) ADD_LIBRARY(uhttpd_ubus MODULE ubus.c) - TARGET_LINK_LIBRARIES(uhttpd_ubus ubus ubox blobmsg_json ${libjson}) + TARGET_LINK_LIBRARIES(uhttpd_ubus ${ubus} ${ubox} ${blobmsg_json} ${libjson}) ENDIF() IF(PLUGINS)