Skip to content

Commit 025ede1

Browse files
igrrdavid-cermak
authored andcommitted
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.
1 parent e6c0538 commit 025ede1

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

components/esp_websocket_client/examples/linux/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ set(EXTRA_COMPONENT_DIRS
88
"${common_component_dir}/linux_compat"
99
"${common_component_dir}/linux_compat/freertos")
1010

11-
list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
1211
list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs)
1312
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
1413

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependencies:
2+
protocol_examples_common:
3+
path: ${IDF_PATH}/examples/common_components/protocol_examples_common

components/esp_websocket_client/examples/target/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,5 @@
22
# in this exact order for cmake to work correctly
33
cmake_minimum_required(VERSION 3.5)
44

5-
# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection.
6-
list(APPEND EXTRA_COMPONENT_DIRS "../../../../common_components/protocol_examples_common")
7-
85
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
96
project(websocket_example)

components/esp_websocket_client/examples/target/main/idf_component.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ dependencies:
44
espressif/esp_websocket_client:
55
version: "^1.0.0"
66
override_path: "../../../"
7+
protocol_examples_common:
8+
path: ${IDF_PATH}/examples/common_components/protocol_examples_common

0 commit comments

Comments
 (0)