From 8f602988d99a9610fb047560bada3dbce7ea39f8 Mon Sep 17 00:00:00 2001 From: zwx Date: Wed, 24 Apr 2024 15:45:10 +0800 Subject: [PATCH] feat(openthread): move iperf dependency into cli extension --- examples/openthread/ot_br/CMakeLists.txt | 3 +-- examples/openthread/ot_br/main/idf_component.yml | 2 +- examples/openthread/ot_cli/CMakeLists.txt | 2 -- examples/openthread/ot_cli/main/idf_component.yml | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/examples/openthread/ot_br/CMakeLists.txt b/examples/openthread/ot_br/CMakeLists.txt index 509229d9b0..6bb56e3002 100644 --- a/examples/openthread/ot_br/CMakeLists.txt +++ b/examples/openthread/ot_br/CMakeLists.txt @@ -4,8 +4,7 @@ cmake_minimum_required(VERSION 3.16) # (Not part of the boilerplate) # This example uses an extra component for common functions such as Wi-Fi and Ethernet connection. -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common - $ENV{IDF_PATH}/examples/common_components/iperf) +set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp_ot_br) diff --git a/examples/openthread/ot_br/main/idf_component.yml b/examples/openthread/ot_br/main/idf_component.yml index 0b743288fd..b6a0a80c2f 100644 --- a/examples/openthread/ot_br/main/idf_component.yml +++ b/examples/openthread/ot_br/main/idf_component.yml @@ -1,7 +1,7 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_ot_cli_extension: - version: "~1.0.0" + version: "~1.1.0" espressif/mdns: "^1.0.3" ## Required IDF version idf: diff --git a/examples/openthread/ot_cli/CMakeLists.txt b/examples/openthread/ot_cli/CMakeLists.txt index d677a901c9..b12d49bfa3 100644 --- a/examples/openthread/ot_cli/CMakeLists.txt +++ b/examples/openthread/ot_cli/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/iperf) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp_ot_cli) diff --git a/examples/openthread/ot_cli/main/idf_component.yml b/examples/openthread/ot_cli/main/idf_component.yml index 722ae188c6..3f1f6778d2 100644 --- a/examples/openthread/ot_cli/main/idf_component.yml +++ b/examples/openthread/ot_cli/main/idf_component.yml @@ -1,7 +1,7 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_ot_cli_extension: - version: "~1.0.0" + version: "~1.1.0" idf: version: ">=4.1.0" ot_led: