From 3662c149fbfdab3331cb43d0ca9a7f2b0d75005d Mon Sep 17 00:00:00 2001 From: Alexey Lapshin Date: Mon, 11 Jul 2022 17:55:29 +0400 Subject: [PATCH 1/3] asio: Fix exampels build --- components/asio/examples/asio_chat/CMakeLists.txt | 2 +- components/asio/examples/async_request/CMakeLists.txt | 2 +- components/asio/examples/socks4/CMakeLists.txt | 2 +- components/asio/examples/ssl_client_server/CMakeLists.txt | 2 +- components/asio/examples/tcp_echo_server/CMakeLists.txt | 2 +- components/asio/examples/udp_echo_server/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/components/asio/examples/asio_chat/CMakeLists.txt b/components/asio/examples/asio_chat/CMakeLists.txt index 2d3c9ecbe..7212f3e33 100644 --- a/components/asio/examples/asio_chat/CMakeLists.txt +++ b/components/asio/examples/asio_chat/CMakeLists.txt @@ -4,7 +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 ../../../../common_components/protocol_examples_common) +set(EXTRA_COMPONENT_DIRS ../.. ../../../../common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(asio_chat) diff --git a/components/asio/examples/async_request/CMakeLists.txt b/components/asio/examples/async_request/CMakeLists.txt index ff659707e..727490ba0 100644 --- a/components/asio/examples/async_request/CMakeLists.txt +++ b/components/asio/examples/async_request/CMakeLists.txt @@ -4,7 +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 ../../../../common_components/protocol_examples_common) +set(EXTRA_COMPONENT_DIRS ../../ ../../../../common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(async_http_request) diff --git a/components/asio/examples/socks4/CMakeLists.txt b/components/asio/examples/socks4/CMakeLists.txt index f1ffe9d12..b1e1aeb25 100644 --- a/components/asio/examples/socks4/CMakeLists.txt +++ b/components/asio/examples/socks4/CMakeLists.txt @@ -4,7 +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 ../../../../common_components/protocol_examples_common) +set(EXTRA_COMPONENT_DIRS ../.. ../../../../common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(asio_sock4) diff --git a/components/asio/examples/ssl_client_server/CMakeLists.txt b/components/asio/examples/ssl_client_server/CMakeLists.txt index 73ee939a7..171887543 100644 --- a/components/asio/examples/ssl_client_server/CMakeLists.txt +++ b/components/asio/examples/ssl_client_server/CMakeLists.txt @@ -4,7 +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 ../../../../common_components/protocol_examples_common) +set(EXTRA_COMPONENT_DIRS ../.. ../../../../common_components/protocol_examples_common) set(EXCLUDE_COMPONENTS openssl) include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/components/asio/examples/tcp_echo_server/CMakeLists.txt b/components/asio/examples/tcp_echo_server/CMakeLists.txt index 29e290677..57a5faa32 100644 --- a/components/asio/examples/tcp_echo_server/CMakeLists.txt +++ b/components/asio/examples/tcp_echo_server/CMakeLists.txt @@ -4,7 +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 ../../../../common_components/protocol_examples_common) +set(EXTRA_COMPONENT_DIRS ../.. ../../../../common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(asio_tcp_echo_server) diff --git a/components/asio/examples/udp_echo_server/CMakeLists.txt b/components/asio/examples/udp_echo_server/CMakeLists.txt index 2e0c28024..4014b91f1 100644 --- a/components/asio/examples/udp_echo_server/CMakeLists.txt +++ b/components/asio/examples/udp_echo_server/CMakeLists.txt @@ -4,7 +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 ../../../../common_components/protocol_examples_common) +set(EXTRA_COMPONENT_DIRS ../../ ../../../../common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(asio_udp_echo_server) From 06e7baf2c244a1161f1a985b516b1b66a29dd3fa Mon Sep 17 00:00:00 2001 From: gabsuren Date: Mon, 11 Jul 2022 16:43:50 +0400 Subject: [PATCH 2/3] CI: Fix ASIO build in CI run --- .github/workflows/build_asio.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_asio.yml b/.github/workflows/build_asio.yml index 83ccf2d94..c8b40330a 100644 --- a/.github/workflows/build_asio.yml +++ b/.github/workflows/build_asio.yml @@ -16,6 +16,7 @@ jobs: - name: Checkout esp-protocols uses: actions/checkout@v3 with: + submodules: recursive path: esp-protocols - name: Build ${{ matrix.example }} with IDF-${{ matrix.idf_ver }} for ${{ matrix.idf_target }} env: From 0b102f6286277ea35fff1001b055a49929757362 Mon Sep 17 00:00:00 2001 From: Alexey Lapshin Date: Mon, 11 Jul 2022 20:39:56 +0400 Subject: [PATCH 3/3] mdns: Fix test_app build --- components/mdns/tests/test_apps/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mdns/tests/test_apps/CMakeLists.txt b/components/mdns/tests/test_apps/CMakeLists.txt index 466df27ef..46a1ff206 100644 --- a/components/mdns/tests/test_apps/CMakeLists.txt +++ b/components/mdns/tests/test_apps/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.5) # (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 "../../../../common_components/protocol_examples_common") +set(EXTRA_COMPONENT_DIRS ../../ ../../../../common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake)