Skip to content

Commit f3a7282

Browse files
fdcavalcantilinguini1
authored andcommitted
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 <[email protected]>
1 parent 6a1b2c6 commit f3a7282

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

netutils/cjson/CMakeLists.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if(CONFIG_NETUTILS_CJSON)
4040
SOURCE_DIR
4141
${CMAKE_CURRENT_LIST_DIR}/cJSON
4242
BINARY_DIR
43-
${CMAKE_BINARY_DIR}/apps/netutils/cjson/cJSON
43+
${NUTTX_APPS_BINDIR}/netutils/cjson/cJSON
4444
DOWNLOAD_NO_PROGRESS true
4545
TIMEOUT 30)
4646

@@ -51,13 +51,13 @@ if(CONFIG_NETUTILS_CJSON)
5151
endif()
5252
endif()
5353

54-
if(NOT EXISTS ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON.h
55-
OR NOT EXISTS ${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON_Utils.h)
56-
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/apps/include/netutils)
54+
if(NOT EXISTS ${NUTTX_APPS_BINDIR}/include/netutils/cJSON.h
55+
OR NOT EXISTS ${NUTTX_APPS_BINDIR}/include/netutils/cJSON_Utils.h)
56+
file(MAKE_DIRECTORY ${NUTTX_APPS_BINDIR}/include/netutils)
5757
file(CREATE_LINK ${CMAKE_CURRENT_LIST_DIR}/cJSON/cJSON.h
58-
${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON.h SYMBOLIC)
58+
${NUTTX_APPS_BINDIR}/include/netutils/cJSON.h SYMBOLIC)
5959
file(CREATE_LINK ${CMAKE_CURRENT_LIST_DIR}/cJSON/cJSON_Utils.h
60-
${CMAKE_BINARY_DIR}/apps/include/netutils/cJSON_Utils.h SYMBOLIC)
60+
${NUTTX_APPS_BINDIR}/include/netutils/cJSON_Utils.h SYMBOLIC)
6161
endif()
6262

6363
target_sources(apps PRIVATE cJSON/cJSON.c cJSON/cJSON_Utils.c)

0 commit comments

Comments
 (0)