Skip to content

Commit

Permalink
Merge branch 'backport/openthread_related_feature_v54_20241125' into …
Browse files Browse the repository at this point in the history
…'release/v5.4'

Backport openthread related features to 5.4

See merge request espressif/esp-idf!35172
  • Loading branch information
chshu committed Nov 26, 2024
2 parents 37cb152 + aa3e5d9 commit 9181eca
Show file tree
Hide file tree
Showing 11 changed files with 1,257 additions and 1,009 deletions.
8 changes: 7 additions & 1 deletion components/openthread/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ if(CONFIG_OPENTHREAD_ENABLED)
"openthread/src/ncp"
"private_include")

set(src_dirs
set(src_dirs
"src"
"src/port"
"openthread/examples/platforms/utils"
Expand Down Expand Up @@ -244,6 +244,12 @@ elseif(CONFIG_OPENTHREAD_SPINEL_ONLY)

endif()

if(CONFIG_OPENTHREAD_HEADER_CUSTOM)
idf_build_get_property(project_dir PROJECT_DIR)
list(APPEND private_include_dirs
"${project_dir}/${CONFIG_OPENTHREAD_CUSTOM_HEADER_PATH}")
endif()

execute_process(
COMMAND git rev-parse --short HEAD
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
Expand Down
Loading

0 comments on commit 9181eca

Please sign in to comment.