From 5b78da4689d2a13197023851bdf0cdd2bf23a885 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 18 Sep 2023 12:19:48 +0200 Subject: [PATCH] fix(esp_modem): specify override_path in example manifest files --- components/esp_modem/examples/ap_to_pppos/CMakeLists.txt | 2 -- .../esp_modem/examples/ap_to_pppos/main/idf_component.yml | 4 ++++ components/esp_modem/examples/linux_modem/CMakeLists.txt | 2 +- .../esp_modem/examples/linux_modem/main/idf_component.yml | 4 ++++ components/esp_modem/examples/modem_psm/CMakeLists.txt | 2 -- .../esp_modem/examples/modem_psm/main/idf_component.yml | 4 ++++ .../esp_modem/examples/modem_tcp_client/CMakeLists.txt | 2 -- .../examples/modem_tcp_client/main/idf_component.yml | 4 ++++ components/esp_modem/examples/pppos_client/CMakeLists.txt | 2 -- .../esp_modem/examples/simple_cmux_client/CMakeLists.txt | 2 -- .../examples/simple_cmux_client/main/idf_component.yml | 4 ++++ components/esp_modem/idf_component.yml | 5 ++++- 12 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 components/esp_modem/examples/ap_to_pppos/main/idf_component.yml create mode 100644 components/esp_modem/examples/linux_modem/main/idf_component.yml create mode 100644 components/esp_modem/examples/modem_psm/main/idf_component.yml create mode 100644 components/esp_modem/examples/modem_tcp_client/main/idf_component.yml create mode 100644 components/esp_modem/examples/simple_cmux_client/main/idf_component.yml diff --git a/components/esp_modem/examples/ap_to_pppos/CMakeLists.txt b/components/esp_modem/examples/ap_to_pppos/CMakeLists.txt index c7d69911f..ee3528632 100644 --- a/components/esp_modem/examples/ap_to_pppos/CMakeLists.txt +++ b/components/esp_modem/examples/ap_to_pppos/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(EXTRA_COMPONENT_DIRS "../..") - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ap-to-pppos) diff --git a/components/esp_modem/examples/ap_to_pppos/main/idf_component.yml b/components/esp_modem/examples/ap_to_pppos/main/idf_component.yml new file mode 100644 index 000000000..3289c9b16 --- /dev/null +++ b/components/esp_modem/examples/ap_to_pppos/main/idf_component.yml @@ -0,0 +1,4 @@ +dependencies: + espressif/esp_modem: + version: "^1.0.1" + override_path: "../../../" diff --git a/components/esp_modem/examples/linux_modem/CMakeLists.txt b/components/esp_modem/examples/linux_modem/CMakeLists.txt index 552e23681..dd08e1b21 100644 --- a/components/esp_modem/examples/linux_modem/CMakeLists.txt +++ b/components/esp_modem/examples/linux_modem/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -set(EXTRA_COMPONENT_DIRS ../.. ../../port/linux) +set(EXTRA_COMPONENT_DIRS ../../port/linux) set(COMPONENTS main) project(linux_modem) diff --git a/components/esp_modem/examples/linux_modem/main/idf_component.yml b/components/esp_modem/examples/linux_modem/main/idf_component.yml new file mode 100644 index 000000000..3289c9b16 --- /dev/null +++ b/components/esp_modem/examples/linux_modem/main/idf_component.yml @@ -0,0 +1,4 @@ +dependencies: + espressif/esp_modem: + version: "^1.0.1" + override_path: "../../../" diff --git a/components/esp_modem/examples/modem_psm/CMakeLists.txt b/components/esp_modem/examples/modem_psm/CMakeLists.txt index ca0ca4bc5..5fe31f3da 100644 --- a/components/esp_modem/examples/modem_psm/CMakeLists.txt +++ b/components/esp_modem/examples/modem_psm/CMakeLists.txt @@ -4,7 +4,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS "../..") - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(modem_psm) diff --git a/components/esp_modem/examples/modem_psm/main/idf_component.yml b/components/esp_modem/examples/modem_psm/main/idf_component.yml new file mode 100644 index 000000000..3289c9b16 --- /dev/null +++ b/components/esp_modem/examples/modem_psm/main/idf_component.yml @@ -0,0 +1,4 @@ +dependencies: + espressif/esp_modem: + version: "^1.0.1" + override_path: "../../../" diff --git a/components/esp_modem/examples/modem_tcp_client/CMakeLists.txt b/components/esp_modem/examples/modem_tcp_client/CMakeLists.txt index d3291e866..cb840e95a 100644 --- a/components/esp_modem/examples/modem_tcp_client/CMakeLists.txt +++ b/components/esp_modem/examples/modem_tcp_client/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.8) -set(EXTRA_COMPONENT_DIRS "../..") - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(modem_tcp_client) diff --git a/components/esp_modem/examples/modem_tcp_client/main/idf_component.yml b/components/esp_modem/examples/modem_tcp_client/main/idf_component.yml new file mode 100644 index 000000000..3289c9b16 --- /dev/null +++ b/components/esp_modem/examples/modem_tcp_client/main/idf_component.yml @@ -0,0 +1,4 @@ +dependencies: + espressif/esp_modem: + version: "^1.0.1" + override_path: "../../../" diff --git a/components/esp_modem/examples/pppos_client/CMakeLists.txt b/components/esp_modem/examples/pppos_client/CMakeLists.txt index 4728071e6..960952578 100644 --- a/components/esp_modem/examples/pppos_client/CMakeLists.txt +++ b/components/esp_modem/examples/pppos_client/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.5) -set(EXTRA_COMPONENT_DIRS "../..") - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(pppos_client) diff --git a/components/esp_modem/examples/simple_cmux_client/CMakeLists.txt b/components/esp_modem/examples/simple_cmux_client/CMakeLists.txt index be1c2ac41..24a58cfc2 100644 --- a/components/esp_modem/examples/simple_cmux_client/CMakeLists.txt +++ b/components/esp_modem/examples/simple_cmux_client/CMakeLists.txt @@ -3,7 +3,5 @@ cmake_minimum_required(VERSION 3.8) set(CMAKE_CXX_STANDARD 17) -set(EXTRA_COMPONENT_DIRS "../..") - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(simple_cmux_client) diff --git a/components/esp_modem/examples/simple_cmux_client/main/idf_component.yml b/components/esp_modem/examples/simple_cmux_client/main/idf_component.yml new file mode 100644 index 000000000..3289c9b16 --- /dev/null +++ b/components/esp_modem/examples/simple_cmux_client/main/idf_component.yml @@ -0,0 +1,4 @@ +dependencies: + espressif/esp_modem: + version: "^1.0.1" + override_path: "../../../" diff --git a/components/esp_modem/idf_component.yml b/components/esp_modem/idf_component.yml index 85350d528..818d8a61f 100644 --- a/components/esp_modem/idf_component.yml +++ b/components/esp_modem/idf_component.yml @@ -1,6 +1,9 @@ version: "1.0.4" -description: esp modem +description: Library for communicating with cellular modems in command and data modes url: https://github.com/espressif/esp-protocols/tree/master/components/esp_modem +issues: https://github.com/espressif/esp-protocols/issues +documentation: https://docs.espressif.com/projects/esp-protocols/esp_modem/docs/latest/index.html +repository: https://github.com/espressif/esp-protocols.git dependencies: # Required IDF version idf: