change(global): add set(COMPONENTS main) in more apps

espressif · Sep 23, 2024 · 5dc5e74 · 5dc5e74
1 parent b5e30df
commit 5dc5e74
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 10 deletions.
diff --git a/cbor/examples/cbor/CMakeLists.txt b/cbor/examples/cbor/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(cbor)
diff --git a/coap/examples/coap_client/CMakeLists.txt b/coap/examples/coap_client/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)
+set(COMPONENTS main)
 project(coap_client)
diff --git a/coap/examples/coap_client/main/idf_component.yml b/coap/examples/coap_client/main/idf_component.yml
@@ -4,3 +4,5 @@ dependencies:
   espressif/coap:
     version: "^4.3.0"
     override_path: '../../../'
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
diff --git a/coap/examples/coap_server/CMakeLists.txt b/coap/examples/coap_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)
+set(COMPONENTS main)
 project(coap_server)
diff --git a/coap/examples/coap_server/main/idf_component.yml b/coap/examples/coap_server/main/idf_component.yml
@@ -4,3 +4,5 @@ dependencies:
   espressif/coap:
     version: "^4.3.0"
     override_path: '../../../'
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
diff --git a/eigen/examples/svd/CMakeLists.txt b/eigen/examples/svd/CMakeLists.txt
@@ -2,5 +2,6 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.5)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(Eigen_SVD)
 
diff --git a/esp_delta_ota/examples/https_delta_ota/CMakeLists.txt b/esp_delta_ota/examples/https_delta_ota/CMakeLists.txt
@@ -1,7 +1,7 @@
 # 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.5)
-list(APPEND EXTRA_COMPONENT_DIRS $ENV{IDF_PATH}/examples/common_components/protocol_examples_common)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(https_delta_ota)
diff --git a/esp_delta_ota/examples/https_delta_ota/main/idf_component.yml b/esp_delta_ota/examples/https_delta_ota/main/idf_component.yml
@@ -5,3 +5,5 @@ dependencies:
   espressif/esp_delta_ota:
     version: '1.*'
     override_path: '../../../'
+  protocol_examples_common:
+    path: ${IDF_PATH}/examples/common_components/protocol_examples_common
diff --git a/esp_jpeg/examples/get_started/CMakeLists.txt b/esp_jpeg/examples/get_started/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(lcd_tjpgd)
diff --git a/esp_jpeg/examples/get_started/main/CMakeLists.txt b/esp_jpeg/examples/get_started/main/CMakeLists.txt
@@ -5,4 +5,5 @@ set(srcs "pretty_effect.c"
 
 idf_component_register(SRCS ${srcs}
                     INCLUDE_DIRS "."
-                    EMBED_FILES image.jpg)
+                    EMBED_FILES image.jpg
+                    PRIV_REQUIRES esp_lcd)
diff --git a/esp_lcd_qemu_rgb/examples/lcd_qemu_rgb_panel/CMakeLists.txt b/esp_lcd_qemu_rgb/examples/lcd_qemu_rgb_panel/CMakeLists.txt
@@ -5,4 +5,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(lcd_qemu_rgb_panel)
diff --git a/iqmath/examples/get_started/CMakeLists.txt b/iqmath/examples/get_started/CMakeLists.txt
@@ -5,4 +5,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(iqmath_get_started)
diff --git a/network_provisioning/examples/wifi_prov/CMakeLists.txt b/network_provisioning/examples/wifi_prov/CMakeLists.txt
@@ -3,4 +3,5 @@
 cmake_minimum_required(VERSION 3.16)
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+set(COMPONENTS main)
 project(wifi_prov)