mirror of
https://github.com/apache/nuttx-apps.git
synced 2026-08-01 20:29:00 +00:00
netutils/mqttc: fix patch and add mbedtls dependency
Add mbedtls dependecy and fix patch path. Signed-off-by: Filipe Cavalcanti <filipe.cavalcanti@espressif.com>
This commit is contained in:
parent
f95b53d15b
commit
bfbeafabbf
1 changed files with 9 additions and 5 deletions
|
|
@ -33,7 +33,7 @@ if(CONFIG_NETUTILS_MQTTC)
|
||||||
FetchContent_Declare(
|
FetchContent_Declare(
|
||||||
mqttc_fetch
|
mqttc_fetch
|
||||||
URL ${MQTTC_URL}/${CONFIG_NETUTILS_MQTTC_VERSION}.tar.gz SOURCE_DIR
|
URL ${MQTTC_URL}/${CONFIG_NETUTILS_MQTTC_VERSION}.tar.gz SOURCE_DIR
|
||||||
${MQTTC_DIR} BINARY_DIR ${CMAKE_BINARY_DIR}/apps/netutils/mqttc/MQTT-C
|
${MQTTC_DIR} BINARY_DIR ${NUTTX_APPS_BINDIR}/netutils/mqttc/MQTT-C
|
||||||
DOWNLOAD_NO_PROGRESS true
|
DOWNLOAD_NO_PROGRESS true
|
||||||
TIMEOUT 30)
|
TIMEOUT 30)
|
||||||
|
|
||||||
|
|
@ -44,9 +44,8 @@ if(CONFIG_NETUTILS_MQTTC)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND
|
COMMAND patch -s -N -d ${MQTTC_DIR} -p1 -i
|
||||||
sh -c
|
${CMAKE_CURRENT_LIST_DIR}/0001_add_connection_status.patch
|
||||||
"cat 0001_add_connection_status.patch | patch -s -N -d $(MQTTC_DIR) -p1"
|
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
|
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
@ -65,6 +64,10 @@ if(CONFIG_NETUTILS_MQTTC)
|
||||||
target_sources(mqttc PRIVATE ${CSRCS})
|
target_sources(mqttc PRIVATE ${CSRCS})
|
||||||
target_compile_options(mqttc PRIVATE ${CFLAGS})
|
target_compile_options(mqttc PRIVATE ${CFLAGS})
|
||||||
|
|
||||||
|
if(CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS AND CONFIG_CRYPTO_MBEDTLS)
|
||||||
|
nuttx_add_dependencies(TARGET mqttc DEPENDS mbedtls)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(CONFIG_NETUTILS_MQTTC_EXAMPLE)
|
if(CONFIG_NETUTILS_MQTTC_EXAMPLE)
|
||||||
if(CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS)
|
if(CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS)
|
||||||
nuttx_add_application(
|
nuttx_add_application(
|
||||||
|
|
@ -79,7 +82,8 @@ if(CONFIG_NETUTILS_MQTTC)
|
||||||
COMPILE_FLAGS
|
COMPILE_FLAGS
|
||||||
${CFLAGS}
|
${CFLAGS}
|
||||||
DEPENDS
|
DEPENDS
|
||||||
mqttc)
|
mqttc
|
||||||
|
mbedtls)
|
||||||
else()
|
else()
|
||||||
set(MQTT_PUB_CFLAGS
|
set(MQTT_PUB_CFLAGS
|
||||||
${CFLAGS}
|
${CFLAGS}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue