Skip to content

Commit d775ac8

Browse files
committed
netutils/mqttc: fix patch and add mbedtls dependency
Add mbedtls dependecy and fix patch path. Signed-off-by: Filipe Cavalcanti <[email protected]>
1 parent 073df9d commit d775ac8

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

netutils/mqttc/CMakeLists.txt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ if(CONFIG_NETUTILS_MQTTC)
3333
FetchContent_Declare(
3434
mqttc_fetch
3535
URL ${MQTTC_URL}/${CONFIG_NETUTILS_MQTTC_VERSION}.tar.gz SOURCE_DIR
36-
${MQTTC_DIR} BINARY_DIR ${CMAKE_BINARY_DIR}/apps/netutils/mqttc/MQTT-C
36+
${MQTTC_DIR} BINARY_DIR ${NUTTX_APPS_BINDIR}/netutils/mqttc/MQTT-C
3737
DOWNLOAD_NO_PROGRESS true
3838
TIMEOUT 30)
3939

@@ -44,9 +44,8 @@ if(CONFIG_NETUTILS_MQTTC)
4444
endif()
4545

4646
execute_process(
47-
COMMAND
48-
sh -c
49-
"cat 0001_add_connection_status.patch | patch -s -N -d $(MQTTC_DIR) -p1"
47+
COMMAND patch -s -N -d ${MQTTC_DIR} -p1 -i
48+
${CMAKE_CURRENT_LIST_DIR}/0001_add_connection_status.patch
5049
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
5150
endif()
5251

@@ -65,6 +64,10 @@ if(CONFIG_NETUTILS_MQTTC)
6564
target_sources(mqttc PRIVATE ${CSRCS})
6665
target_compile_options(mqttc PRIVATE ${CFLAGS})
6766

67+
if(CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS AND CONFIG_CRYPTO_MBEDTLS)
68+
nuttx_add_dependencies(TARGET mqttc DEPENDS mbedtls)
69+
endif()
70+
6871
if(CONFIG_NETUTILS_MQTTC_EXAMPLE)
6972
if(CONFIG_NETUTILS_MQTTC_WITH_MBEDTLS)
7073
nuttx_add_application(
@@ -79,7 +82,8 @@ if(CONFIG_NETUTILS_MQTTC)
7982
COMPILE_FLAGS
8083
${CFLAGS}
8184
DEPENDS
82-
mqttc)
85+
mqttc
86+
mbedtls)
8387
else()
8488
set(MQTT_PUB_CFLAGS
8589
${CFLAGS}

0 commit comments

Comments
 (0)