Merge branch 'fix/add_component_dependency_for_ext_cmds' into 'main'

fix(ext_cmd): add dependency for extension commands See merge request espressif/esp-thread-br!141
espressif · Sep 18, 2024 · 2fe4e26 · 2fe4e26
2 parents 2eab508 + 7b509f6
commit 2fe4e26
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/components/esp_ot_cli_extension/CMakeLists.txt b/components/esp_ot_cli_extension/CMakeLists.txt
@@ -42,3 +42,7 @@ endif()
 if (CONFIG_OPENTHREAD_RCP_COMMAND)
     idf_component_optional_requires(PRIVATE esp_rcp_update)
 endif()
+
+if(CONFIG_OPENTHREAD_CLI_WIFI)
+    idf_component_optional_requires(PRIVATE protocol_examples_common)
+endif()
diff --git a/components/esp_ot_cli_extension/idf_component.yml b/components/esp_ot_cli_extension/idf_component.yml
@@ -1,4 +1,4 @@
-version: "1.2.3"
+version: "1.2.4"
 description: Espressif OpenThread CLI Extension
 url: https://github.com/espressif/esp-thread-br/tree/main/components/esp_ot_cli_extension
 dependencies:

diff --git a/examples/basic_thread_border_router/CMakeLists.txt b/examples/basic_thread_border_router/CMakeLists.txt
@@ -8,7 +8,6 @@ set(EXTRA_COMPONENT_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/../common
     ${CMAKE_CURRENT_SOURCE_DIR}/../../components/esp_br_http_ota
     ${CMAKE_CURRENT_SOURCE_DIR}/../../components/esp_ot_br_server
-    $ENV{IDF_PATH}/examples/common_components/protocol_examples_common
 )
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)

diff --git a/examples/basic_thread_border_router/main/idf_component.yml b/examples/basic_thread_border_router/main/idf_component.yml
@@ -11,3 +11,5 @@ dependencies:
   idf:
     version: ">=4.1.0"
   # # Put list of dependencies here
+  protocol_examples_common:
+     path: ${IDF_PATH}/examples/common_components/protocol_examples_common