From b176d3abbb741a8b77ae564cc93cfad72b440f94 Mon Sep 17 00:00:00 2001 From: David Cermak Date: Tue, 28 Nov 2023 07:23:32 +0100 Subject: [PATCH] fix(websocket): Revert referencing protocol_examples_common from IDF This reverts commit 025ede12e843ab41a55d8b095b758656a41c441d. --- 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, 4 insertions(+), 5 deletions(-) delete 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 2a08ac5e8..b4c7bb3a9 100644 --- a/components/esp_websocket_client/examples/linux/CMakeLists.txt +++ b/components/esp_websocket_client/examples/linux/CMakeLists.txt @@ -8,6 +8,7 @@ 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 deleted file mode 100644 index 718194867..000000000 --- a/components/esp_websocket_client/examples/linux/main/idf_component.yml +++ /dev/null @@ -1,3 +0,0 @@ -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 6858816b3..53f7bc054 100644 --- a/components/esp_websocket_client/examples/target/CMakeLists.txt +++ b/components/esp_websocket_client/examples/target/CMakeLists.txt @@ -2,5 +2,8 @@ # 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 0cc1eea4d..dbbe4a314 100644 --- a/components/esp_websocket_client/examples/target/main/idf_component.yml +++ b/components/esp_websocket_client/examples/target/main/idf_component.yml @@ -4,5 +4,3 @@ dependencies: espressif/esp_websocket_client: version: "^1.0.0" override_path: "../../../" - protocol_examples_common: - path: ${IDF_PATH}/examples/common_components/protocol_examples_common