From 025ede12e843ab41a55d8b095b758656a41c441d Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Thu, 21 Sep 2023 16:26:45 +0200 Subject: [PATCH] fix(esp_websocket_client): reference protocol_examples_common from IDF This makes the 'target' example usable from the component registry. 'linux' example still has a bunch of EXTRA_COMPONENT_DIRS, but at least we can delete the protocol_examples_common copy. --- components/esp_websocket_client/examples/linux/CMakeLists.txt | 1 - .../esp_websocket_client/examples/linux/main/idf_component.yml | 3 +++ components/esp_websocket_client/examples/target/CMakeLists.txt | 3 --- .../examples/target/main/idf_component.yml | 2 ++ 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 components/esp_websocket_client/examples/linux/main/idf_component.yml diff --git a/components/esp_websocket_client/examples/linux/CMakeLists.txt b/components/esp_websocket_client/examples/linux/CMakeLists.txt index b4c7bb3a9..2a08ac5e8 100644 --- a/components/esp_websocket_client/examples/linux/CMakeLists.txt +++ b/components/esp_websocket_client/examples/linux/CMakeLists.txt @@ -8,7 +8,6 @@ set(EXTRA_COMPONENT_DIRS "${common_component_dir}/linux_compat" "${common_component_dir}/linux_compat/freertos") -list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/esp_websocket_client/examples/linux/main/idf_component.yml b/components/esp_websocket_client/examples/linux/main/idf_component.yml new file mode 100644 index 000000000..718194867 --- /dev/null +++ b/components/esp_websocket_client/examples/linux/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/components/esp_websocket_client/examples/target/CMakeLists.txt b/components/esp_websocket_client/examples/target/CMakeLists.txt index 53f7bc054..6858816b3 100644 --- a/components/esp_websocket_client/examples/target/CMakeLists.txt +++ b/components/esp_websocket_client/examples/target/CMakeLists.txt @@ -2,8 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection. -list(APPEND EXTRA_COMPONENT_DIRS "../../../../common_components/protocol_examples_common") - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(websocket_example) diff --git a/components/esp_websocket_client/examples/target/main/idf_component.yml b/components/esp_websocket_client/examples/target/main/idf_component.yml index dbbe4a314..0cc1eea4d 100644 --- a/components/esp_websocket_client/examples/target/main/idf_component.yml +++ b/components/esp_websocket_client/examples/target/main/idf_component.yml @@ -4,3 +4,5 @@ dependencies: espressif/esp_websocket_client: version: "^1.0.0" override_path: "../../../" + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common