You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by fd...@apache.org on 2026/03/24 17:58:19 UTC
(nuttx-apps) 01/01: netutils/cjson: fix apps path in CMake
This is an automated email from the ASF dual-hosted git repository.
fdcavalcanti pushed a commit to branch bugfix/apps-path
in repository https://gitbox.apache.org/repos/asf/nuttx-apps.git
commit 92bd8547ba3256cfee9060a457326a67b655e7fe
Author: Filipe Cavalcanti <fi...@espressif.com>
AuthorDate: Tue Mar 24 14:57:03 2026 -0300
netutils/cjson: fix apps path in CMake
Fix mismatch on apps directory naming when it is cloned under 'nuttx-apps' instead of 'apps'.
Signed-off-by: Filipe Cavalcanti <fi...@espressif.com>
---
netutils/cjson/CMakeLists.txt | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/netutils/cjson/CMakeLists.txt b/netutils/cjson/CMakeLists.txt
index 729dbc619..00ea68f74 100644
--- a/netutils/cjson/CMakeLists.txt
+++ b/netutils/cjson/CMakeLists.txt
@@ -31,6 +31,9 @@ if(CONFIG_NETUTILS_CJSON)
set(CONFIG_NETUTILS_CJSON_VERSION "1.7.10")
endif()
+ message(STATUS "===========CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}")
+ message(STATUS "===========NUTTX_APPS_BINDIR: ${NUTTX_APPS_BINDIR}")
+
if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/cJSON)
FetchContent_Declare(
cJSON
@@ -40,7 +43,7 @@ if(CONFIG_NETUTILS_CJSON)
SOURCE_DIR
${CMAKE_CURRENT_LIST_DIR}/cJSON
BINARY_DIR
- ${CMAKE_BINARY_DIR}/apps/netutils/cjson/cJSON
+ ${NUTTX_APPS_BINDIR}/netutils/cjson/cJSON
DOWNLOAD_NO_PROGRESS true
TIMEOUT 30)
@@ -51,13 +54,13 @@ if(CONFIG_NETUTILS_CJSON)
endif()
endif()
- if(NOT EXISTS ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON.h
- OR NOT EXISTS ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON_Utils.h)
- file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/apps/include/netutils)
+ if(NOT EXISTS ${NUTTX_APPS_BINDIR}/include/netutils/cJSON.h
+ OR NOT EXISTS ${NUTTX_APPS_BINDIR}/include/netutils/cJSON_Utils.h)
+ file(MAKE_DIRECTORY ${NUTTX_APPS_BINDIR}/include/netutils)
file(CREATE_LINK ${CMAKE_CURRENT_LIST_DIR}/cJSON/cJSON.h
- ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON.h SYMBOLIC)
+ ${NUTTX_APPS_BINDIR}/include/netutils/cJSON.h SYMBOLIC)
file(CREATE_LINK ${CMAKE_CURRENT_LIST_DIR}/cJSON/cJSON_Utils.h
- ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON_Utils.h SYMBOLIC)
+ ${NUTTX_APPS_BINDIR}/include/netutils/cJSON_Utils.h SYMBOLIC)
endif()
target_sources(apps PRIVATE cJSON/cJSON.c cJSON/cJSON_Utils.c)