diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/aligenie_demo/CMakeLists.txt index cc65be4c416..ef3d39b8447 100644 --- a/examples/bluetooth/esp_ble_mesh/aligenie_demo/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/CMakeLists.txt @@ -2,11 +2,6 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(aligenie_demo) diff --git a/examples/bluetooth/esp_ble_mesh/aligenie_demo/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/aligenie_demo/main/idf_component.yml new file mode 100644 index 00000000000..b0da63e6f24 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/aligenie_demo/main/idf_component.yml @@ -0,0 +1,9 @@ +dependencies: + button: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button + light_driver: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + example_nvs: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/CMakeLists.txt index b3ad88ab5a9..dcb999f2ef7 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/CMakeLists.txt @@ -2,10 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(onoff_client) diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/main/idf_component.yml new file mode 100644 index 00000000000..b0da63e6f24 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_client/main/idf_component.yml @@ -0,0 +1,9 @@ +dependencies: + button: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button + light_driver: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + example_nvs: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/CMakeLists.txt index 884a4ed7dfb..c2e123e7689 100644 --- a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/CMakeLists.txt @@ -2,9 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(onoff_server) diff --git a/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/main/idf_component.yml new file mode 100644 index 00000000000..b0da63e6f24 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/directed_forwarding/df_server/main/idf_component.yml @@ -0,0 +1,9 @@ +dependencies: + button: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button + light_driver: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + example_nvs: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/CMakeLists.txt index ed5bc4e1697..e3d91badd22 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/CMakeLists.txt @@ -2,8 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(fast_prov_client) diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/main/idf_component.yml new file mode 100644 index 00000000000..41f62627c0a --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_client/main/idf_component.yml @@ -0,0 +1,5 @@ +dependencies: + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + fast_prov: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/CMakeLists.txt index 8a4ec34714f..9191b78100a 100644 --- a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/CMakeLists.txt @@ -2,8 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(fast_prov_server) diff --git a/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/main/idf_component.yml new file mode 100644 index 00000000000..41f62627c0a --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/main/idf_component.yml @@ -0,0 +1,5 @@ +dependencies: + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + fast_prov: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/CMakeLists.txt index 3409d2f1081..dcb999f2ef7 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/CMakeLists.txt @@ -2,9 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(onoff_client) diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/main/idf_component.yml new file mode 100644 index 00000000000..db1bab92c3d --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_client/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + button: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + example_nvs: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/CMakeLists.txt index 956058f4a96..c2e123e7689 100644 --- a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(onoff_server) diff --git a/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/main/idf_component.yml new file mode 100644 index 00000000000..43c11335694 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/onoff_models/onoff_server/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/provisioner/CMakeLists.txt index a9f36c1a916..bb23642349b 100644 --- a/examples/bluetooth/esp_ble_mesh/provisioner/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/provisioner/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(provisioner) diff --git a/examples/bluetooth/esp_ble_mesh/provisioner/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/provisioner/main/idf_component.yml new file mode 100644 index 00000000000..43c11335694 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/provisioner/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/CMakeLists.txt index 0f89672c6d1..2fc83bab6bb 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/CMakeLists.txt @@ -2,10 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ble_mesh_provisioner) diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/main/idf_component.yml new file mode 100644 index 00000000000..b0da63e6f24 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_client/main/idf_component.yml @@ -0,0 +1,9 @@ +dependencies: + button: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button + light_driver: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + example_nvs: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/CMakeLists.txt index 47d782116b7..c2e123e7689 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/CMakeLists.txt @@ -2,9 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(onoff_server) diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/main/idf_component.yml new file mode 100644 index 00000000000..ed186e502a0 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/rpr_server/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + light_driver: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + example_nvs: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/CMakeLists.txt index 47d782116b7..c2e123e7689 100644 --- a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/CMakeLists.txt @@ -2,9 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(onoff_server) diff --git a/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/main/idf_component.yml new file mode 100644 index 00000000000..ed186e502a0 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/remote_provisioning/unprov_dev/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + light_driver: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/light_driver + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + example_nvs: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/CMakeLists.txt index 6a63bb5acb6..df8cdc2a6f7 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/CMakeLists.txt @@ -2,8 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(sensor_client) diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/main/idf_component.yml new file mode 100644 index 00000000000..36733fdcb37 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_client/main/idf_component.yml @@ -0,0 +1,5 @@ +dependencies: + button: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/CMakeLists.txt index 42b0863956e..a6d68ca161b 100644 --- a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(sensor_server) diff --git a/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/main/idf_component.yml new file mode 100644 index 00000000000..43c11335694 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/sensor_models/sensor_server/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/CMakeLists.txt index dfaac35fe23..aa900088996 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/CMakeLists.txt @@ -2,9 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(vendor_client) diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/main/idf_component.yml new file mode 100644 index 00000000000..db1bab92c3d --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_client/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + button: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/button + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + example_nvs: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_nvs diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/CMakeLists.txt index 66a55b876dc..a389de923f1 100644 --- a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(vendor_server) diff --git a/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/main/idf_component.yml new file mode 100644 index 00000000000..43c11335694 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/vendor_models/vendor_server/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/CMakeLists.txt b/examples/bluetooth/esp_ble_mesh/wifi_coexist/CMakeLists.txt index bf5448c6527..63fc9622bd5 100644 --- a/examples/bluetooth/esp_ble_mesh/wifi_coexist/CMakeLists.txt +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/CMakeLists.txt @@ -2,9 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init - $ENV{IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov - $ENV{IDF_PATH}/examples/common_components/iperf) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(wifi_coexist) diff --git a/examples/bluetooth/esp_ble_mesh/wifi_coexist/main/idf_component.yml b/examples/bluetooth/esp_ble_mesh/wifi_coexist/main/idf_component.yml new file mode 100644 index 00000000000..9f4c98345f3 --- /dev/null +++ b/examples/bluetooth/esp_ble_mesh/wifi_coexist/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + fast_prov: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/fast_prov + example_init: + path: ${IDF_PATH}/examples/bluetooth/esp_ble_mesh/common_components/example_init + iperf: + path: ${IDF_PATH}/examples/common_components/iperf diff --git a/examples/bluetooth/hci/ble_adv_scan_combined/CMakeLists.txt b/examples/bluetooth/hci/ble_adv_scan_combined/CMakeLists.txt index e0ff215dba9..f5e3555891e 100644 --- a/examples/bluetooth/hci/ble_adv_scan_combined/CMakeLists.txt +++ b/examples/bluetooth/hci/ble_adv_scan_combined/CMakeLists.txt @@ -2,8 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -# This example uses an extra component for common functions for Bluetooth HCI layer. -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/hci/hci_common_component) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ble_adv_scan) diff --git a/examples/bluetooth/hci/ble_adv_scan_combined/main/idf_component.yml b/examples/bluetooth/hci/ble_adv_scan_combined/main/idf_component.yml new file mode 100644 index 00000000000..99657414326 --- /dev/null +++ b/examples/bluetooth/hci/ble_adv_scan_combined/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + hci_common_component: + path: ${IDF_PATH}/examples/bluetooth/hci/hci_common_component diff --git a/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt b/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt index 0f6afaadc4a..f10daca8a72 100644 --- a/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt +++ b/examples/bluetooth/hci/controller_vhci_ble_adv/CMakeLists.txt @@ -2,8 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -# This example uses an extra component for common functions for Bluetooth HCI layer. -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/hci/hci_common_component) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ble_adv) diff --git a/examples/bluetooth/hci/controller_vhci_ble_adv/main/idf_component.yml b/examples/bluetooth/hci/controller_vhci_ble_adv/main/idf_component.yml new file mode 100644 index 00000000000..99657414326 --- /dev/null +++ b/examples/bluetooth/hci/controller_vhci_ble_adv/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + hci_common_component: + path: ${IDF_PATH}/examples/bluetooth/hci/hci_common_component diff --git a/examples/bluetooth/nimble/ble_dynamic_service/CMakeLists.txt b/examples/bluetooth/nimble/ble_dynamic_service/CMakeLists.txt index 28cd09e5371..ec090376e97 100644 --- a/examples/bluetooth/nimble/ble_dynamic_service/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_dynamic_service/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ble_dynamic_service) diff --git a/examples/bluetooth/nimble/ble_dynamic_service/main/idf_component.yml b/examples/bluetooth/nimble/ble_dynamic_service/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/ble_dynamic_service/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/CMakeLists.txt b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/CMakeLists.txt index 9fd41ea1d8e..3e162616436 100644 --- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(enc_adv_data_cent) diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/idf_component.yml b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/idf_component.yml new file mode 100644 index 00000000000..db8886afea4 --- /dev/null +++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_cent/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_central_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/CMakeLists.txt b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/CMakeLists.txt index 603a43c5098..ca984ef42ac 100644 --- a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(enc_adv_data_prph) diff --git a/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/idf_component.yml b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/ble_enc_adv_data/enc_adv_data_prph/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/bluetooth/nimble/ble_htp/htp_cent/CMakeLists.txt b/examples/bluetooth/nimble/ble_htp/htp_cent/CMakeLists.txt index 5464a4ed1b4..598618f67c0 100644 --- a/examples/bluetooth/nimble/ble_htp/htp_cent/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_htp/htp_cent/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(htp_cent) diff --git a/examples/bluetooth/nimble/ble_htp/htp_cent/main/idf_component.yml b/examples/bluetooth/nimble/ble_htp/htp_cent/main/idf_component.yml new file mode 100644 index 00000000000..db8886afea4 --- /dev/null +++ b/examples/bluetooth/nimble/ble_htp/htp_cent/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_central_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/CMakeLists.txt b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/CMakeLists.txt index 2bd3526463c..6265291deca 100644 --- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/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 $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(coc_blecent) diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/idf_component.yml b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/idf_component.yml new file mode 100644 index 00000000000..db8886afea4 --- /dev/null +++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_central_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/CMakeLists.txt b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/CMakeLists.txt index 54e37540548..74e67340373 100644 --- a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/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 $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(coc_bleprph) diff --git a/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/idf_component.yml b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/bluetooth/nimble/ble_multi_adv/CMakeLists.txt b/examples/bluetooth/nimble/ble_multi_adv/CMakeLists.txt index 13fcb1c54dc..1870d856d78 100644 --- a/examples/bluetooth/nimble/ble_multi_adv/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_multi_adv/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ble_multi_adv) diff --git a/examples/bluetooth/nimble/ble_multi_adv/main/idf_component.yml b/examples/bluetooth/nimble/ble_multi_adv/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/ble_multi_adv/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/CMakeLists.txt b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/CMakeLists.txt index 06382888f1e..f443dbefda4 100644 --- a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(blecent) diff --git a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/main/idf_component.yml b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/main/idf_component.yml new file mode 100644 index 00000000000..db8886afea4 --- /dev/null +++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_cent/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_central_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils diff --git a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/CMakeLists.txt b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/CMakeLists.txt index 59f95346232..0e8a4553f95 100644 --- a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(bleprph) diff --git a/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/main/idf_component.yml b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/ble_multi_conn/ble_multi_conn_prph/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/bluetooth/nimble/ble_periodic_adv/CMakeLists.txt b/examples/bluetooth/nimble/ble_periodic_adv/CMakeLists.txt index a11db0a8cb2..eb90d28ab6c 100644 --- a/examples/bluetooth/nimble/ble_periodic_adv/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_periodic_adv/CMakeLists.txt @@ -1,7 +1,6 @@ # The following lines of boilerplate have to be in your project's # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ble_periodic_adv) diff --git a/examples/bluetooth/nimble/ble_periodic_adv/main/idf_component.yml b/examples/bluetooth/nimble/ble_periodic_adv/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/ble_periodic_adv/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/bluetooth/nimble/ble_periodic_sync/CMakeLists.txt b/examples/bluetooth/nimble/ble_periodic_sync/CMakeLists.txt index 0cfa53d6f5a..74095c0ea8b 100644 --- a/examples/bluetooth/nimble/ble_periodic_sync/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_periodic_sync/CMakeLists.txt @@ -1,6 +1,5 @@ # The following lines of boilerplate have to be in your project's # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ble_periodic_sync) diff --git a/examples/bluetooth/nimble/ble_periodic_sync/main/idf_component.yml b/examples/bluetooth/nimble/ble_periodic_sync/main/idf_component.yml new file mode 100644 index 00000000000..db8886afea4 --- /dev/null +++ b/examples/bluetooth/nimble/ble_periodic_sync/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_central_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils diff --git a/examples/bluetooth/nimble/ble_phy/phy_cent/CMakeLists.txt b/examples/bluetooth/nimble/ble_phy/phy_cent/CMakeLists.txt index 585df842c55..b72760eacf7 100644 --- a/examples/bluetooth/nimble/ble_phy/phy_cent/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_phy/phy_cent/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(phy_cent) diff --git a/examples/bluetooth/nimble/ble_phy/phy_cent/main/idf_component.yml b/examples/bluetooth/nimble/ble_phy/phy_cent/main/idf_component.yml new file mode 100644 index 00000000000..db8886afea4 --- /dev/null +++ b/examples/bluetooth/nimble/ble_phy/phy_cent/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_central_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils diff --git a/examples/bluetooth/nimble/ble_phy/phy_prph/CMakeLists.txt b/examples/bluetooth/nimble/ble_phy/phy_prph/CMakeLists.txt index ae9a5b0e9c9..793e1a330aa 100644 --- a/examples/bluetooth/nimble/ble_phy/phy_prph/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_phy/phy_prph/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(phy_prph) diff --git a/examples/bluetooth/nimble/ble_phy/phy_prph/main/idf_component.yml b/examples/bluetooth/nimble/ble_phy/phy_prph/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/ble_phy/phy_prph/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/CMakeLists.txt b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/CMakeLists.txt index 855567dfb7b..bfb3c5c81bb 100644 --- a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(proximity_sensor_cent) diff --git a/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/main/idf_component.yml b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/main/idf_component.yml new file mode 100644 index 00000000000..db8886afea4 --- /dev/null +++ b/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_cent/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_central_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils diff --git a/examples/bluetooth/nimble/ble_spp/spp_client/CMakeLists.txt b/examples/bluetooth/nimble/ble_spp/spp_client/CMakeLists.txt index 487f50656f9..615f271b6ca 100644 --- a/examples/bluetooth/nimble/ble_spp/spp_client/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_spp/spp_client/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(spp_client) diff --git a/examples/bluetooth/nimble/ble_spp/spp_client/main/idf_component.yml b/examples/bluetooth/nimble/ble_spp/spp_client/main/idf_component.yml new file mode 100644 index 00000000000..db8886afea4 --- /dev/null +++ b/examples/bluetooth/nimble/ble_spp/spp_client/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_central_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils diff --git a/examples/bluetooth/nimble/ble_spp/spp_server/CMakeLists.txt b/examples/bluetooth/nimble/ble_spp/spp_server/CMakeLists.txt index 32da2da9a7e..99cadaff235 100644 --- a/examples/bluetooth/nimble/ble_spp/spp_server/CMakeLists.txt +++ b/examples/bluetooth/nimble/ble_spp/spp_server/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(spp_server) diff --git a/examples/bluetooth/nimble/ble_spp/spp_server/main/idf_component.yml b/examples/bluetooth/nimble/ble_spp/spp_server/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/ble_spp/spp_server/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/bluetooth/nimble/blecent/CMakeLists.txt b/examples/bluetooth/nimble/blecent/CMakeLists.txt index 06382888f1e..f443dbefda4 100644 --- a/examples/bluetooth/nimble/blecent/CMakeLists.txt +++ b/examples/bluetooth/nimble/blecent/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(blecent) diff --git a/examples/bluetooth/nimble/blecent/main/idf_component.yml b/examples/bluetooth/nimble/blecent/main/idf_component.yml new file mode 100644 index 00000000000..db8886afea4 --- /dev/null +++ b/examples/bluetooth/nimble/blecent/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_central_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_central_utils diff --git a/examples/bluetooth/nimble/bleprph/CMakeLists.txt b/examples/bluetooth/nimble/bleprph/CMakeLists.txt index 59f95346232..0e8a4553f95 100644 --- a/examples/bluetooth/nimble/bleprph/CMakeLists.txt +++ b/examples/bluetooth/nimble/bleprph/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(bleprph) diff --git a/examples/bluetooth/nimble/bleprph/main/idf_component.yml b/examples/bluetooth/nimble/bleprph/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/bleprph/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/bluetooth/nimble/power_save/CMakeLists.txt b/examples/bluetooth/nimble/power_save/CMakeLists.txt index 41d9ebf1290..908aa9b15a8 100644 --- a/examples/bluetooth/nimble/power_save/CMakeLists.txt +++ b/examples/bluetooth/nimble/power_save/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(power_save) diff --git a/examples/bluetooth/nimble/power_save/main/idf_component.yml b/examples/bluetooth/nimble/power_save/main/idf_component.yml new file mode 100644 index 00000000000..d6e735fe770 --- /dev/null +++ b/examples/bluetooth/nimble/power_save/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + nimble_peripheral_utils: + path: ${IDF_PATH}/examples/bluetooth/nimble/common/nimble_peripheral_utils diff --git a/examples/common_components/protocol_examples_tapif_io/README.md b/examples/common_components/protocol_examples_tapif_io/README.md index c39394aa476..61566dcccf9 100644 --- a/examples/common_components/protocol_examples_tapif_io/README.md +++ b/examples/common_components/protocol_examples_tapif_io/README.md @@ -7,9 +7,11 @@ It could be used to route lwip traffic to host side network, typically when work ### Usage of the API -1) Add the path to this component to the `EXTRA_COMPONENT_DIRS` in your project makefile -```cmake -list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/common_components/tapif_io") +1) Add the path to this component to as a dependency to the `main` component of your project using the following idf_component.yml file: +```yaml +dependencies: + tapif_io: + path: ${IDF_PATH}/examples/common_components/tapif_io ``` 2) Include lwip and linux side of the configuration ```cpp diff --git a/examples/ethernet/iperf/CMakeLists.txt b/examples/ethernet/iperf/CMakeLists.txt index ff4d488339f..773736ed190 100644 --- a/examples/ethernet/iperf/CMakeLists.txt +++ b/examples/ethernet/iperf/CMakeLists.txt @@ -2,9 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components - $ENV{IDF_PATH}/examples/common_components/iperf - $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ethernet_iperf) diff --git a/examples/ethernet/iperf/main/idf_component.yml b/examples/ethernet/iperf/main/idf_component.yml new file mode 100644 index 00000000000..8b9ecd9116b --- /dev/null +++ b/examples/ethernet/iperf/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + cmd_system: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system + ethernet_init: + path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init + iperf: + path: ${IDF_PATH}/examples/common_components/iperf diff --git a/examples/network/bridge/CMakeLists.txt b/examples/network/bridge/CMakeLists.txt index 3161df5b0dd..774bc527d7e 100644 --- a/examples/network/bridge/CMakeLists.txt +++ b/examples/network/bridge/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(bridge) diff --git a/examples/network/bridge/main/idf_component.yml b/examples/network/bridge/main/idf_component.yml new file mode 100644 index 00000000000..8453ecc2191 --- /dev/null +++ b/examples/network/bridge/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + ethernet_init: + path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init diff --git a/examples/network/eth2ap/CMakeLists.txt b/examples/network/eth2ap/CMakeLists.txt index daf2d1f3185..ec2b0f57d9b 100644 --- a/examples/network/eth2ap/CMakeLists.txt +++ b/examples/network/eth2ap/CMakeLists.txt @@ -1,6 +1,4 @@ cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(eth2ap) diff --git a/examples/network/eth2ap/main/idf_component.yml b/examples/network/eth2ap/main/idf_component.yml new file mode 100644 index 00000000000..8453ecc2191 --- /dev/null +++ b/examples/network/eth2ap/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + ethernet_init: + path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init diff --git a/examples/network/simple_sniffer/CMakeLists.txt b/examples/network/simple_sniffer/CMakeLists.txt index a314a64c390..5097b1500a4 100644 --- a/examples/network/simple_sniffer/CMakeLists.txt +++ b/examples/network/simple_sniffer/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(simple_sniffer) diff --git a/examples/network/simple_sniffer/main/idf_component.yml b/examples/network/simple_sniffer/main/idf_component.yml index c407c54eb46..45810f2f6bc 100644 --- a/examples/network/simple_sniffer/main/idf_component.yml +++ b/examples/network/simple_sniffer/main/idf_component.yml @@ -1,2 +1,4 @@ dependencies: pcap: "^1.0.0" + ethernet_init: + path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init diff --git a/examples/network/sta2eth/CMakeLists.txt b/examples/network/sta2eth/CMakeLists.txt index 11459c67f20..a565b19f348 100644 --- a/examples/network/sta2eth/CMakeLists.txt +++ b/examples/network/sta2eth/CMakeLists.txt @@ -2,9 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -# This example needs a DNS server: let's use the simple DNS server implementation from captive portal example -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/http_server/captive_portal/components/dns_server - $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(sta_to_eth) diff --git a/examples/network/sta2eth/main/idf_component.yml b/examples/network/sta2eth/main/idf_component.yml index bff20c669a8..21db5940d05 100644 --- a/examples/network/sta2eth/main/idf_component.yml +++ b/examples/network/sta2eth/main/idf_component.yml @@ -5,5 +5,9 @@ dependencies: rules: - if: "idf_version >=4.4" - if: "target in [esp32s2, esp32s3]" + dns_server: + path: ${IDF_PATH}/examples/protocols/http_server/captive_portal/components/dns_server + ethernet_init: + path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init idf: "^5.0" diff --git a/examples/network/vlan_support/CMakeLists.txt b/examples/network/vlan_support/CMakeLists.txt index 4ed01ae191c..c70832fdbb2 100644 --- a/examples/network/vlan_support/CMakeLists.txt +++ b/examples/network/vlan_support/CMakeLists.txt @@ -3,8 +3,6 @@ # The following five lines of boilerplate have to be in your project's # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) - -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/ethernet/basic/components/ethernet_init) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(vlan_support) diff --git a/examples/network/vlan_support/main/idf_component.yml b/examples/network/vlan_support/main/idf_component.yml new file mode 100644 index 00000000000..8453ecc2191 --- /dev/null +++ b/examples/network/vlan_support/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + ethernet_init: + path: ${IDF_PATH}/examples/ethernet/basic/components/ethernet_init diff --git a/examples/openthread/ot_br/CMakeLists.txt b/examples/openthread/ot_br/CMakeLists.txt index 509229d9b07..93545935493 100644 --- a/examples/openthread/ot_br/CMakeLists.txt +++ b/examples/openthread/ot_br/CMakeLists.txt @@ -2,10 +2,5 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common - $ENV{IDF_PATH}/examples/common_components/iperf) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp_ot_br) diff --git a/examples/openthread/ot_br/main/idf_component.yml b/examples/openthread/ot_br/main/idf_component.yml index 947edba2ddd..98376227fe3 100644 --- a/examples/openthread/ot_br/main/idf_component.yml +++ b/examples/openthread/ot_br/main/idf_component.yml @@ -6,3 +6,7 @@ dependencies: ## Required IDF version idf: version: ">=5.0" + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common + iperf: + path: ${IDF_PATH}/examples/common_components/iperf diff --git a/examples/openthread/ot_cli/CMakeLists.txt b/examples/openthread/ot_cli/CMakeLists.txt index d677a901c98..b12d49bfa30 100644 --- a/examples/openthread/ot_cli/CMakeLists.txt +++ b/examples/openthread/ot_cli/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/iperf) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp_ot_cli) diff --git a/examples/openthread/ot_cli/main/idf_component.yml b/examples/openthread/ot_cli/main/idf_component.yml index 9d13c3b6159..ea2b9511152 100644 --- a/examples/openthread/ot_cli/main/idf_component.yml +++ b/examples/openthread/ot_cli/main/idf_component.yml @@ -4,3 +4,5 @@ dependencies: version: "~0.4.0" idf: version: ">=4.1.0" + iperf: + path: ${IDF_PATH}/examples/common_components/iperf diff --git a/examples/peripherals/i2c/i2c_tools/CMakeLists.txt b/examples/peripherals/i2c/i2c_tools/CMakeLists.txt index e482e2aaf57..c44548e53b3 100644 --- a/examples/peripherals/i2c/i2c_tools/CMakeLists.txt +++ b/examples/peripherals/i2c/i2c_tools/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(i2c_tools) diff --git a/examples/peripherals/i2c/i2c_tools/main/idf_component.yml b/examples/peripherals/i2c/i2c_tools/main/idf_component.yml new file mode 100644 index 00000000000..aacef0f4000 --- /dev/null +++ b/examples/peripherals/i2c/i2c_tools/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + cmd_system: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system + cmd_nvs: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_nvs + cmd_wifi: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_wifi diff --git a/examples/peripherals/usb/host/uvc/CMakeLists.txt b/examples/peripherals/usb/host/uvc/CMakeLists.txt index e85e1a87120..9cab8a3bcb8 100644 --- a/examples/peripherals/usb/host/uvc/CMakeLists.txt +++ b/examples/peripherals/usb/host/uvc/CMakeLists.txt @@ -2,7 +2,5 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(usb-uvc) diff --git a/examples/peripherals/usb/host/uvc/main/idf_component.yml b/examples/peripherals/usb/host/uvc/main/idf_component.yml index 8b906ef6cfb..09a14cfce76 100644 --- a/examples/peripherals/usb/host/uvc/main/idf_component.yml +++ b/examples/peripherals/usb/host/uvc/main/idf_component.yml @@ -5,3 +5,5 @@ dependencies: mdns: rules: - if: "idf_version >= 5.0" + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/phy/cert_test/CMakeLists.txt b/examples/phy/cert_test/CMakeLists.txt index 607964536c9..c34a1147cde 100644 --- a/examples/phy/cert_test/CMakeLists.txt +++ b/examples/phy/cert_test/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(cert_test) diff --git a/examples/phy/cert_test/main/idf_component.yml b/examples/phy/cert_test/main/idf_component.yml new file mode 100644 index 00000000000..aacef0f4000 --- /dev/null +++ b/examples/phy/cert_test/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + cmd_system: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system + cmd_nvs: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_nvs + cmd_wifi: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_wifi diff --git a/examples/protocols/esp_http_client/CMakeLists.txt b/examples/protocols/esp_http_client/CMakeLists.txt index cf0ca4da7ad..e012d1a3fd0 100644 --- a/examples/protocols/esp_http_client/CMakeLists.txt +++ b/examples/protocols/esp_http_client/CMakeLists.txt @@ -2,10 +2,7 @@ # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) - if(${IDF_TARGET} STREQUAL "linux") - list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs) set(COMPONENTS main) endif() diff --git a/examples/protocols/esp_http_client/main/idf_component.yml b/examples/protocols/esp_http_client/main/idf_component.yml new file mode 100644 index 00000000000..c17c116c4bd --- /dev/null +++ b/examples/protocols/esp_http_client/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common + esp_stubs: + path: ${IDF_PATH}/examples/protocols/linux_stubs/esp_stubs + rules: + - if: "target in [linux]" diff --git a/examples/protocols/esp_local_ctrl/CMakeLists.txt b/examples/protocols/esp_local_ctrl/CMakeLists.txt index 507a362b520..ce8a5b0ba40 100644 --- a/examples/protocols/esp_local_ctrl/CMakeLists.txt +++ b/examples/protocols/esp_local_ctrl/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp_local_ctrl) diff --git a/examples/protocols/esp_local_ctrl/main/idf_component.yml b/examples/protocols/esp_local_ctrl/main/idf_component.yml index 39fbd718299..7bddebc1aa7 100644 --- a/examples/protocols/esp_local_ctrl/main/idf_component.yml +++ b/examples/protocols/esp_local_ctrl/main/idf_component.yml @@ -4,3 +4,5 @@ dependencies: ## Required IDF version idf: version: ">=5.0" + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/http_request/CMakeLists.txt b/examples/protocols/http_request/CMakeLists.txt index cc403d31225..428aa223d18 100644 --- a/examples/protocols/http_request/CMakeLists.txt +++ b/examples/protocols/http_request/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(http_request) diff --git a/examples/protocols/http_request/main/idf_component.yml b/examples/protocols/http_request/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/http_request/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/http_server/advanced_tests/CMakeLists.txt b/examples/protocols/http_server/advanced_tests/CMakeLists.txt index 5b8311cf839..ced9a1e677d 100644 --- a/examples/protocols/http_server/advanced_tests/CMakeLists.txt +++ b/examples/protocols/http_server/advanced_tests/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(tests) diff --git a/examples/protocols/http_server/advanced_tests/main/idf_component.yml b/examples/protocols/http_server/advanced_tests/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/http_server/advanced_tests/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/http_server/async_handlers/CMakeLists.txt b/examples/protocols/http_server/async_handlers/CMakeLists.txt index 62cb350dd49..3ada908f263 100644 --- a/examples/protocols/http_server/async_handlers/CMakeLists.txt +++ b/examples/protocols/http_server/async_handlers/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(simple) diff --git a/examples/protocols/http_server/async_handlers/main/idf_component.yml b/examples/protocols/http_server/async_handlers/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/http_server/async_handlers/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/http_server/file_serving/CMakeLists.txt b/examples/protocols/http_server/file_serving/CMakeLists.txt index d9592f04410..b4edc23832f 100644 --- a/examples/protocols/http_server/file_serving/CMakeLists.txt +++ b/examples/protocols/http_server/file_serving/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(file_server) diff --git a/examples/protocols/http_server/file_serving/main/idf_component.yml b/examples/protocols/http_server/file_serving/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/http_server/file_serving/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/http_server/persistent_sockets/CMakeLists.txt b/examples/protocols/http_server/persistent_sockets/CMakeLists.txt index 11a6e8bb9d9..c2f23bebcd1 100644 --- a/examples/protocols/http_server/persistent_sockets/CMakeLists.txt +++ b/examples/protocols/http_server/persistent_sockets/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(persistent_sockets) diff --git a/examples/protocols/http_server/persistent_sockets/main/idf_component.yml b/examples/protocols/http_server/persistent_sockets/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/http_server/persistent_sockets/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/http_server/restful_server/CMakeLists.txt b/examples/protocols/http_server/restful_server/CMakeLists.txt index a077eb8fcca..7d7eaa220cc 100644 --- a/examples/protocols/http_server/restful_server/CMakeLists.txt +++ b/examples/protocols/http_server/restful_server/CMakeLists.txt @@ -1,7 +1,5 @@ cmake_minimum_required(VERSION 3.16) -# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection. -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(restful_server) diff --git a/examples/protocols/http_server/restful_server/main/idf_component.yml b/examples/protocols/http_server/restful_server/main/idf_component.yml index 39fbd718299..7bddebc1aa7 100644 --- a/examples/protocols/http_server/restful_server/main/idf_component.yml +++ b/examples/protocols/http_server/restful_server/main/idf_component.yml @@ -4,3 +4,5 @@ dependencies: ## Required IDF version idf: version: ">=5.0" + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/http_server/simple/CMakeLists.txt b/examples/protocols/http_server/simple/CMakeLists.txt index e6994a73fdf..42acdd7cc75 100644 --- a/examples/protocols/http_server/simple/CMakeLists.txt +++ b/examples/protocols/http_server/simple/CMakeLists.txt @@ -2,10 +2,7 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) - if(${IDF_TARGET} STREQUAL "linux") - list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs") set(COMPONENTS main) endif() diff --git a/examples/protocols/http_server/simple/main/idf_component.yml b/examples/protocols/http_server/simple/main/idf_component.yml new file mode 100644 index 00000000000..c17c116c4bd --- /dev/null +++ b/examples/protocols/http_server/simple/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common + esp_stubs: + path: ${IDF_PATH}/examples/protocols/linux_stubs/esp_stubs + rules: + - if: "target in [linux]" diff --git a/examples/protocols/http_server/ws_echo_server/CMakeLists.txt b/examples/protocols/http_server/ws_echo_server/CMakeLists.txt index 7bbaf6c8f5d..f2f53ffd025 100644 --- a/examples/protocols/http_server/ws_echo_server/CMakeLists.txt +++ b/examples/protocols/http_server/ws_echo_server/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ws_echo_server) diff --git a/examples/protocols/http_server/ws_echo_server/main/idf_component.yml b/examples/protocols/http_server/ws_echo_server/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/http_server/ws_echo_server/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/https_mbedtls/CMakeLists.txt b/examples/protocols/https_mbedtls/CMakeLists.txt index e22321ac008..0233bc37e73 100644 --- a/examples/protocols/https_mbedtls/CMakeLists.txt +++ b/examples/protocols/https_mbedtls/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(https_mbedtls) diff --git a/examples/protocols/https_mbedtls/main/idf_component.yml b/examples/protocols/https_mbedtls/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/https_mbedtls/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/https_request/CMakeLists.txt b/examples/protocols/https_request/CMakeLists.txt index d4e0c6a1dec..7222b1adf51 100644 --- a/examples/protocols/https_request/CMakeLists.txt +++ b/examples/protocols/https_request/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(https_request) diff --git a/examples/protocols/https_request/main/idf_component.yml b/examples/protocols/https_request/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/https_request/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/https_server/simple/CMakeLists.txt b/examples/protocols/https_server/simple/CMakeLists.txt index 6fd8ca3926b..4cd82ede085 100644 --- a/examples/protocols/https_server/simple/CMakeLists.txt +++ b/examples/protocols/https_server/simple/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(https_server) diff --git a/examples/protocols/https_server/simple/main/idf_component.yml b/examples/protocols/https_server/simple/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/https_server/simple/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/https_server/wss_server/CMakeLists.txt b/examples/protocols/https_server/wss_server/CMakeLists.txt index 20c974ed16d..360d5db7794 100644 --- a/examples/protocols/https_server/wss_server/CMakeLists.txt +++ b/examples/protocols/https_server/wss_server/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(wss_server) diff --git a/examples/protocols/https_server/wss_server/main/idf_component.yml b/examples/protocols/https_server/wss_server/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/https_server/wss_server/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/https_x509_bundle/CMakeLists.txt b/examples/protocols/https_x509_bundle/CMakeLists.txt index 0c0444024ee..b911200e6bb 100644 --- a/examples/protocols/https_x509_bundle/CMakeLists.txt +++ b/examples/protocols/https_x509_bundle/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(https_x509_bundle) diff --git a/examples/protocols/https_x509_bundle/main/idf_component.yml b/examples/protocols/https_x509_bundle/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/https_x509_bundle/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/icmp_echo/CMakeLists.txt b/examples/protocols/icmp_echo/CMakeLists.txt index 731a0c1b1ad..c63cf2a8299 100644 --- a/examples/protocols/icmp_echo/CMakeLists.txt +++ b/examples/protocols/icmp_echo/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(icmp_echo) diff --git a/examples/protocols/icmp_echo/main/idf_component.yml b/examples/protocols/icmp_echo/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/icmp_echo/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/l2tap/CMakeLists.txt b/examples/protocols/l2tap/CMakeLists.txt index b0c52c89c45..c978d634446 100644 --- a/examples/protocols/l2tap/CMakeLists.txt +++ b/examples/protocols/l2tap/CMakeLists.txt @@ -2,8 +2,6 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection. -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(l2tap_example) diff --git a/examples/protocols/l2tap/main/idf_component.yml b/examples/protocols/l2tap/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/l2tap/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/modbus/serial/mb_master/CMakeLists.txt b/examples/protocols/modbus/serial/mb_master/CMakeLists.txt index 1b30d1a529f..7bfc34d3390 100644 --- a/examples/protocols/modbus/serial/mb_master/CMakeLists.txt +++ b/examples/protocols/modbus/serial/mb_master/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/modbus/mb_example_common) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(modbus_master) diff --git a/examples/protocols/modbus/serial/mb_master/main/idf_component.yml b/examples/protocols/modbus/serial/mb_master/main/idf_component.yml index caf4c18da77..3eb79f2560c 100644 --- a/examples/protocols/modbus/serial/mb_master/main/idf_component.yml +++ b/examples/protocols/modbus/serial/mb_master/main/idf_component.yml @@ -2,3 +2,5 @@ dependencies: idf: ">=4.1" espressif/esp-modbus: version: "^1.0" + mb_example_common: + path: ${IDF_PATH}/examples/protocols/modbus/mb_example_common diff --git a/examples/protocols/modbus/serial/mb_slave/CMakeLists.txt b/examples/protocols/modbus/serial/mb_slave/CMakeLists.txt index b74657d27e2..c45d418b469 100644 --- a/examples/protocols/modbus/serial/mb_slave/CMakeLists.txt +++ b/examples/protocols/modbus/serial/mb_slave/CMakeLists.txt @@ -2,8 +2,6 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/modbus/mb_example_common) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(modbus_slave) diff --git a/examples/protocols/modbus/serial/mb_slave/main/idf_component.yml b/examples/protocols/modbus/serial/mb_slave/main/idf_component.yml index caf4c18da77..3eb79f2560c 100644 --- a/examples/protocols/modbus/serial/mb_slave/main/idf_component.yml +++ b/examples/protocols/modbus/serial/mb_slave/main/idf_component.yml @@ -2,3 +2,5 @@ dependencies: idf: ">=4.1" espressif/esp-modbus: version: "^1.0" + mb_example_common: + path: ${IDF_PATH}/examples/protocols/modbus/mb_example_common diff --git a/examples/protocols/modbus/tcp/mb_tcp_master/CMakeLists.txt b/examples/protocols/modbus/tcp/mb_tcp_master/CMakeLists.txt index 48d38dd32c2..6364c3599ae 100644 --- a/examples/protocols/modbus/tcp/mb_tcp_master/CMakeLists.txt +++ b/examples/protocols/modbus/tcp/mb_tcp_master/CMakeLists.txt @@ -2,10 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/modbus/mb_example_common) -# (Not part of the boilerplate) -# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection. -list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(modbus_tcp_master) diff --git a/examples/protocols/modbus/tcp/mb_tcp_master/main/idf_component.yml b/examples/protocols/modbus/tcp/mb_tcp_master/main/idf_component.yml index 542ec33e55c..f4bde51446b 100644 --- a/examples/protocols/modbus/tcp/mb_tcp_master/main/idf_component.yml +++ b/examples/protocols/modbus/tcp/mb_tcp_master/main/idf_component.yml @@ -4,3 +4,7 @@ dependencies: version: ">=4.1.0" espressif/esp-modbus: version: "^1.0" + mb_example_common: + path: ${IDF_PATH}/examples/protocols/modbus/mb_example_common + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/modbus/tcp/mb_tcp_slave/CMakeLists.txt b/examples/protocols/modbus/tcp/mb_tcp_slave/CMakeLists.txt index 8707de641aa..7af78457dc8 100644 --- a/examples/protocols/modbus/tcp/mb_tcp_slave/CMakeLists.txt +++ b/examples/protocols/modbus/tcp/mb_tcp_slave/CMakeLists.txt @@ -3,11 +3,7 @@ cmake_minimum_required(VERSION 3.16) # This component includes modbus example common definitions -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/protocols/modbus/mb_example_common) -# (Not part of the boilerplate) -# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection. -list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(modbus_tcp_slave) diff --git a/examples/protocols/modbus/tcp/mb_tcp_slave/main/idf_component.yml b/examples/protocols/modbus/tcp/mb_tcp_slave/main/idf_component.yml index debc03c5c4d..08bd2149921 100644 --- a/examples/protocols/modbus/tcp/mb_tcp_slave/main/idf_component.yml +++ b/examples/protocols/modbus/tcp/mb_tcp_slave/main/idf_component.yml @@ -3,3 +3,7 @@ dependencies: idf: ">=4.1" espressif/esp-modbus: version: "^1.0" + mb_example_common: + path: ${IDF_PATH}/examples/protocols/modbus/mb_example_common + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/mqtt/ssl/CMakeLists.txt b/examples/protocols/mqtt/ssl/CMakeLists.txt index 3d2fba104d5..994f2f23798 100644 --- a/examples/protocols/mqtt/ssl/CMakeLists.txt +++ b/examples/protocols/mqtt/ssl/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(mqtt_ssl) diff --git a/examples/protocols/mqtt/ssl/main/idf_component.yml b/examples/protocols/mqtt/ssl/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/mqtt/ssl/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/mqtt/ssl_ds/CMakeLists.txt b/examples/protocols/mqtt/ssl_ds/CMakeLists.txt index 144cf8b4db6..ce04bb08b7d 100644 --- a/examples/protocols/mqtt/ssl_ds/CMakeLists.txt +++ b/examples/protocols/mqtt/ssl_ds/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(mqtt_ssl_ds) diff --git a/examples/protocols/mqtt/ssl_ds/main/idf_component.yml b/examples/protocols/mqtt/ssl_ds/main/idf_component.yml index 8dd90a3b089..947ec180420 100644 --- a/examples/protocols/mqtt/ssl_ds/main/idf_component.yml +++ b/examples/protocols/mqtt/ssl_ds/main/idf_component.yml @@ -1,3 +1,5 @@ ## IDF Component Manager Manifest File dependencies: espressif/esp_secure_cert_mgr: "^2.0.2" + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/mqtt/ssl_mutual_auth/CMakeLists.txt b/examples/protocols/mqtt/ssl_mutual_auth/CMakeLists.txt index 14512ad0c55..fc3d759049f 100644 --- a/examples/protocols/mqtt/ssl_mutual_auth/CMakeLists.txt +++ b/examples/protocols/mqtt/ssl_mutual_auth/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(mqtt_ssl_mutual_auth) diff --git a/examples/protocols/mqtt/ssl_mutual_auth/main/idf_component.yml b/examples/protocols/mqtt/ssl_mutual_auth/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/mqtt/ssl_mutual_auth/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/mqtt/ssl_psk/CMakeLists.txt b/examples/protocols/mqtt/ssl_psk/CMakeLists.txt index a4e8aa6016f..d9c1a5fe373 100644 --- a/examples/protocols/mqtt/ssl_psk/CMakeLists.txt +++ b/examples/protocols/mqtt/ssl_psk/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(mqtt_ssl_psk) diff --git a/examples/protocols/mqtt/ssl_psk/main/idf_component.yml b/examples/protocols/mqtt/ssl_psk/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/mqtt/ssl_psk/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/mqtt/tcp/CMakeLists.txt b/examples/protocols/mqtt/tcp/CMakeLists.txt index 7dd960dccf7..d6d9432990c 100644 --- a/examples/protocols/mqtt/tcp/CMakeLists.txt +++ b/examples/protocols/mqtt/tcp/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(mqtt_tcp) diff --git a/examples/protocols/mqtt/tcp/main/idf_component.yml b/examples/protocols/mqtt/tcp/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/mqtt/tcp/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/mqtt/ws/CMakeLists.txt b/examples/protocols/mqtt/ws/CMakeLists.txt index 6c84eb79985..475dd9e41e7 100644 --- a/examples/protocols/mqtt/ws/CMakeLists.txt +++ b/examples/protocols/mqtt/ws/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(mqtt_websocket) diff --git a/examples/protocols/mqtt/ws/main/idf_component.yml b/examples/protocols/mqtt/ws/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/mqtt/ws/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/mqtt/wss/CMakeLists.txt b/examples/protocols/mqtt/wss/CMakeLists.txt index 2a624407b4e..20c1fde634c 100644 --- a/examples/protocols/mqtt/wss/CMakeLists.txt +++ b/examples/protocols/mqtt/wss/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(mqtt_websocket_secure) diff --git a/examples/protocols/mqtt/wss/main/idf_component.yml b/examples/protocols/mqtt/wss/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/mqtt/wss/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/mqtt5/CMakeLists.txt b/examples/protocols/mqtt5/CMakeLists.txt index 7764590fc99..19304b42f07 100644 --- a/examples/protocols/mqtt5/CMakeLists.txt +++ b/examples/protocols/mqtt5/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(mqtt5) diff --git a/examples/protocols/mqtt5/main/idf_component.yml b/examples/protocols/mqtt5/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/mqtt5/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/smtp_client/CMakeLists.txt b/examples/protocols/smtp_client/CMakeLists.txt index ccdf57e202a..8ebc8738776 100644 --- a/examples/protocols/smtp_client/CMakeLists.txt +++ b/examples/protocols/smtp_client/CMakeLists.txt @@ -2,8 +2,6 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -# This example uses an extra component for common functions such as Wi-Fi and Ethernet connection. -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(smtp_client) diff --git a/examples/protocols/smtp_client/main/idf_component.yml b/examples/protocols/smtp_client/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/smtp_client/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/sntp/CMakeLists.txt b/examples/protocols/sntp/CMakeLists.txt index 3a794c8b4ff..62443a677a7 100644 --- a/examples/protocols/sntp/CMakeLists.txt +++ b/examples/protocols/sntp/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(sntp) diff --git a/examples/protocols/sntp/main/idf_component.yml b/examples/protocols/sntp/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/sntp/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/sockets/icmpv6_ping/CMakeLists.txt b/examples/protocols/sockets/icmpv6_ping/CMakeLists.txt index a9fe701648a..40b7d39e252 100644 --- a/examples/protocols/sockets/icmpv6_ping/CMakeLists.txt +++ b/examples/protocols/sockets/icmpv6_ping/CMakeLists.txt @@ -1,8 +1,6 @@ # The following five lines of boilerplate have to be in your project's # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) - -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(icmpv6_ping) diff --git a/examples/protocols/sockets/icmpv6_ping/main/idf_component.yml b/examples/protocols/sockets/icmpv6_ping/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/sockets/icmpv6_ping/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/sockets/non_blocking/CMakeLists.txt b/examples/protocols/sockets/non_blocking/CMakeLists.txt index cb60cfd9662..e6f06b5f080 100644 --- a/examples/protocols/sockets/non_blocking/CMakeLists.txt +++ b/examples/protocols/sockets/non_blocking/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(non_blocking_socket) diff --git a/examples/protocols/sockets/non_blocking/main/idf_component.yml b/examples/protocols/sockets/non_blocking/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/sockets/non_blocking/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/sockets/tcp_client/CMakeLists.txt b/examples/protocols/sockets/tcp_client/CMakeLists.txt index cf2f5a88958..425e07bf164 100644 --- a/examples/protocols/sockets/tcp_client/CMakeLists.txt +++ b/examples/protocols/sockets/tcp_client/CMakeLists.txt @@ -1,10 +1,8 @@ # The following lines of boilerplate have to be in your project's # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) if("${IDF_TARGET}" STREQUAL "linux") - list(APPEND EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/examples/protocols/linux_stubs/esp_stubs") set(COMPONENTS main) endif() diff --git a/examples/protocols/sockets/tcp_client/main/idf_component.yml b/examples/protocols/sockets/tcp_client/main/idf_component.yml new file mode 100644 index 00000000000..c17c116c4bd --- /dev/null +++ b/examples/protocols/sockets/tcp_client/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common + esp_stubs: + path: ${IDF_PATH}/examples/protocols/linux_stubs/esp_stubs + rules: + - if: "target in [linux]" diff --git a/examples/protocols/sockets/tcp_client_multi_net/CMakeLists.txt b/examples/protocols/sockets/tcp_client_multi_net/CMakeLists.txt index cb5c3f05812..2a1c0af6360 100644 --- a/examples/protocols/sockets/tcp_client_multi_net/CMakeLists.txt +++ b/examples/protocols/sockets/tcp_client_multi_net/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(tcp_client_multiple) diff --git a/examples/protocols/sockets/tcp_client_multi_net/main/idf_component.yml b/examples/protocols/sockets/tcp_client_multi_net/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/sockets/tcp_client_multi_net/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/sockets/tcp_server/CMakeLists.txt b/examples/protocols/sockets/tcp_server/CMakeLists.txt index 1214842ddab..22ae003fdfd 100644 --- a/examples/protocols/sockets/tcp_server/CMakeLists.txt +++ b/examples/protocols/sockets/tcp_server/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(tcp_server) diff --git a/examples/protocols/sockets/tcp_server/main/idf_component.yml b/examples/protocols/sockets/tcp_server/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/sockets/tcp_server/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/sockets/tcp_transport_client/CMakeLists.txt b/examples/protocols/sockets/tcp_transport_client/CMakeLists.txt index 888ca62b162..79462a3ee54 100644 --- a/examples/protocols/sockets/tcp_transport_client/CMakeLists.txt +++ b/examples/protocols/sockets/tcp_transport_client/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(tcp_transport_client) diff --git a/examples/protocols/sockets/tcp_transport_client/main/idf_component.yml b/examples/protocols/sockets/tcp_transport_client/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/sockets/tcp_transport_client/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/sockets/udp_client/CMakeLists.txt b/examples/protocols/sockets/udp_client/CMakeLists.txt index c2559179e10..2db190c9d1e 100644 --- a/examples/protocols/sockets/udp_client/CMakeLists.txt +++ b/examples/protocols/sockets/udp_client/CMakeLists.txt @@ -3,12 +3,7 @@ cmake_minimum_required(VERSION 3.16) if("${IDF_TARGET}" STREQUAL "linux") - # This example uses an extra component with common functionality for lwip's port on linux target - set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_tapif_io) set(COMPONENTS main esp_netif lwip protocol_examples_tapif_io startup esp_hw_support esp_system nvs_flash) -else() - # This example uses an extra component for common functions such as Wi-Fi and Ethernet connection on ESP target - set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) endif() include($ENV{IDF_PATH}/tools/cmake/project.cmake) diff --git a/examples/protocols/sockets/udp_client/main/idf_component.yml b/examples/protocols/sockets/udp_client/main/idf_component.yml new file mode 100644 index 00000000000..d51e66f1022 --- /dev/null +++ b/examples/protocols/sockets/udp_client/main/idf_component.yml @@ -0,0 +1,9 @@ +dependencies: + protocol_examples_tapif_io: + path: ${IDF_PATH}/examples/common_components/protocol_examples_tapif_io + rules: + - if: "target in [linux]" + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common + rules: + - if: "target not in [linux]" diff --git a/examples/protocols/sockets/udp_multicast/CMakeLists.txt b/examples/protocols/sockets/udp_multicast/CMakeLists.txt index c93ac423e5b..c8d4f163a68 100644 --- a/examples/protocols/sockets/udp_multicast/CMakeLists.txt +++ b/examples/protocols/sockets/udp_multicast/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(udp_multicast) diff --git a/examples/protocols/sockets/udp_multicast/main/idf_component.yml b/examples/protocols/sockets/udp_multicast/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/sockets/udp_multicast/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/protocols/sockets/udp_server/CMakeLists.txt b/examples/protocols/sockets/udp_server/CMakeLists.txt index c27ec68ef46..adc2de90861 100644 --- a/examples/protocols/sockets/udp_server/CMakeLists.txt +++ b/examples/protocols/sockets/udp_server/CMakeLists.txt @@ -2,9 +2,6 @@ # CMakeLists in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(udp_server) diff --git a/examples/protocols/sockets/udp_server/main/idf_component.yml b/examples/protocols/sockets/udp_server/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/protocols/sockets/udp_server/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/system/console/advanced_usb_cdc/CMakeLists.txt b/examples/system/console/advanced_usb_cdc/CMakeLists.txt index 3b15392ae80..b005ae74da6 100644 --- a/examples/system/console/advanced_usb_cdc/CMakeLists.txt +++ b/examples/system/console/advanced_usb_cdc/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(console_usb) diff --git a/examples/system/console/advanced_usb_cdc/main/idf_component.yml b/examples/system/console/advanced_usb_cdc/main/idf_component.yml new file mode 100644 index 00000000000..aacef0f4000 --- /dev/null +++ b/examples/system/console/advanced_usb_cdc/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + cmd_system: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system + cmd_nvs: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_nvs + cmd_wifi: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_wifi diff --git a/examples/system/console/basic/CMakeLists.txt b/examples/system/console/basic/CMakeLists.txt index d514ee420de..5247b367e92 100644 --- a/examples/system/console/basic/CMakeLists.txt +++ b/examples/system/console/basic/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(console) diff --git a/examples/system/console/basic/main/idf_component.yml b/examples/system/console/basic/main/idf_component.yml new file mode 100644 index 00000000000..aacef0f4000 --- /dev/null +++ b/examples/system/console/basic/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + cmd_system: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system + cmd_nvs: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_nvs + cmd_wifi: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_wifi diff --git a/examples/system/ota/advanced_https_ota/CMakeLists.txt b/examples/system/ota/advanced_https_ota/CMakeLists.txt index 8f47db83ebe..f89de5e6b1b 100644 --- a/examples/system/ota/advanced_https_ota/CMakeLists.txt +++ b/examples/system/ota/advanced_https_ota/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(advanced_https_ota) diff --git a/examples/system/ota/advanced_https_ota/main/idf_component.yml b/examples/system/ota/advanced_https_ota/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/system/ota/advanced_https_ota/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/system/ota/native_ota_example/CMakeLists.txt b/examples/system/ota/native_ota_example/CMakeLists.txt index cf72f28f09c..0fcc1e5b00c 100644 --- a/examples/system/ota/native_ota_example/CMakeLists.txt +++ b/examples/system/ota/native_ota_example/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(native_ota) diff --git a/examples/system/ota/native_ota_example/main/idf_component.yml b/examples/system/ota/native_ota_example/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/system/ota/native_ota_example/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/system/ota/pre_encrypted_ota/CMakeLists.txt b/examples/system/ota/pre_encrypted_ota/CMakeLists.txt index 8cdeb45f711..df49470c0df 100644 --- a/examples/system/ota/pre_encrypted_ota/CMakeLists.txt +++ b/examples/system/ota/pre_encrypted_ota/CMakeLists.txt @@ -3,7 +3,6 @@ # The following five lines of boilerplate have to be in your project's # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(pre_encrypted_ota) diff --git a/examples/system/ota/pre_encrypted_ota/main/idf_component.yml b/examples/system/ota/pre_encrypted_ota/main/idf_component.yml index e0dcbd50a13..eb11ca8debe 100644 --- a/examples/system/ota/pre_encrypted_ota/main/idf_component.yml +++ b/examples/system/ota/pre_encrypted_ota/main/idf_component.yml @@ -1,2 +1,4 @@ dependencies: espressif/esp_encrypted_img: "^2.0.1" + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/system/ota/simple_ota_example/CMakeLists.txt b/examples/system/ota/simple_ota_example/CMakeLists.txt index 5467820f592..37106afe8a3 100644 --- a/examples/system/ota/simple_ota_example/CMakeLists.txt +++ b/examples/system/ota/simple_ota_example/CMakeLists.txt @@ -2,9 +2,6 @@ # in this exact order for cmake to work correctly 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 $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(simple_ota) diff --git a/examples/system/ota/simple_ota_example/main/idf_component.yml b/examples/system/ota/simple_ota_example/main/idf_component.yml new file mode 100644 index 00000000000..718194867b7 --- /dev/null +++ b/examples/system/ota/simple_ota_example/main/idf_component.yml @@ -0,0 +1,3 @@ +dependencies: + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common diff --git a/examples/wifi/ftm/CMakeLists.txt b/examples/wifi/ftm/CMakeLists.txt index 28882679278..3ab48fa49b5 100644 --- a/examples/wifi/ftm/CMakeLists.txt +++ b/examples/wifi/ftm/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(ftm) diff --git a/examples/wifi/ftm/main/idf_component.yml b/examples/wifi/ftm/main/idf_component.yml new file mode 100644 index 00000000000..aacef0f4000 --- /dev/null +++ b/examples/wifi/ftm/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + cmd_system: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system + cmd_nvs: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_nvs + cmd_wifi: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_wifi diff --git a/examples/wifi/iperf/CMakeLists.txt b/examples/wifi/iperf/CMakeLists.txt index 40c237b98fb..1913ec8a9df 100644 --- a/examples/wifi/iperf/CMakeLists.txt +++ b/examples/wifi/iperf/CMakeLists.txt @@ -2,8 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components - $ENV{IDF_PATH}/examples/common_components/iperf) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(iperf) diff --git a/examples/wifi/iperf/main/idf_component.yml b/examples/wifi/iperf/main/idf_component.yml new file mode 100644 index 00000000000..1c70392e2d3 --- /dev/null +++ b/examples/wifi/iperf/main/idf_component.yml @@ -0,0 +1,5 @@ +dependencies: + cmd_system: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system + iperf: + path: ${IDF_PATH}/examples/common_components/iperf diff --git a/examples/wifi/itwt/CMakeLists.txt b/examples/wifi/itwt/CMakeLists.txt index de90c341878..3b0a05216b1 100644 --- a/examples/wifi/itwt/CMakeLists.txt +++ b/examples/wifi/itwt/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components - $ENV{IDF_PATH}/examples/common_components/iperf) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(itwt) diff --git a/examples/wifi/itwt/main/idf_component.yml b/examples/wifi/itwt/main/idf_component.yml new file mode 100644 index 00000000000..da61b1e507f --- /dev/null +++ b/examples/wifi/itwt/main/idf_component.yml @@ -0,0 +1,9 @@ +dependencies: + cmd_system: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system + cmd_nvs: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_nvs + cmd_wifi: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_wifi + iperf: + path: ${IDF_PATH}/examples/common_components/iperf diff --git a/examples/wifi/wifi_aware/nan_console/CMakeLists.txt b/examples/wifi/wifi_aware/nan_console/CMakeLists.txt index 4805700b81e..b08fb7cd937 100644 --- a/examples/wifi/wifi_aware/nan_console/CMakeLists.txt +++ b/examples/wifi/wifi_aware/nan_console/CMakeLists.txt @@ -2,7 +2,5 @@ # in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/system/console/advanced/components) - include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(nan_console) diff --git a/examples/wifi/wifi_aware/nan_console/main/idf_component.yml b/examples/wifi/wifi_aware/nan_console/main/idf_component.yml new file mode 100644 index 00000000000..aacef0f4000 --- /dev/null +++ b/examples/wifi/wifi_aware/nan_console/main/idf_component.yml @@ -0,0 +1,7 @@ +dependencies: + cmd_system: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_system + cmd_nvs: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_nvs + cmd_wifi: + path: ${IDF_PATH}/examples/system/console/advanced/components/cmd_wifi diff --git a/examples/zigbee/esp_zigbee_gateway/CMakeLists.txt b/examples/zigbee/esp_zigbee_gateway/CMakeLists.txt index eac8c5c438a..4d579709261 100644 --- a/examples/zigbee/esp_zigbee_gateway/CMakeLists.txt +++ b/examples/zigbee/esp_zigbee_gateway/CMakeLists.txt @@ -3,6 +3,5 @@ # The following five lines of boilerplate have to be in your project's # CMakeLists in this exact order for cmake to work correctly cmake_minimum_required(VERSION 3.16) -set(EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common) include($ENV{IDF_PATH}/tools/cmake/project.cmake) project(esp_zigbee_gateway) diff --git a/examples/zigbee/esp_zigbee_gateway/main/idf_component.yml b/examples/zigbee/esp_zigbee_gateway/main/idf_component.yml index 1d60ab3792f..b02a13eaeca 100644 --- a/examples/zigbee/esp_zigbee_gateway/main/idf_component.yml +++ b/examples/zigbee/esp_zigbee_gateway/main/idf_component.yml @@ -5,3 +5,5 @@ dependencies: ## Required IDF version idf: version: ">=5.0.0" + protocol_examples_common: + path: ${IDF_PATH}/examples/common_components/protocol_examples_common