update to Component Manager 2.x

CMakeLists.txt

@@ -6,23 +6,10 @@ cmake_minimum_required(VERSION 3.5)
 
 # Select board configuration based on -DBUILD_BOARD
 if(NOT DEFINED BUILD_BOARD)
-    message(FATAL_ERROR "BUILD_BOARD CMake variable is not set")
+    message(FATAL_ERROR "BUILD_BOARD CMake variable is not set. Use idf.py @boards/BOARD.cfg build")
 endif()
 
-set(ENV{USE_ESP_BOX} "0")
-set(ENV{USE_ESP_BOX_3} "0")
-set(ENV{USE_M5STACK_CORE_S3} "0")
-set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "0")
-
-if (BUILD_BOARD STREQUAL "esp-box")
-    set(ENV{USE_ESP_BOX} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp-box-3")
-    set(ENV{USE_ESP_BOX_3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "m5stack_core_s3")
-    set(ENV{USE_M5STACK_CORE_S3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp32_p4_function_ev_board")
-    set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "esp32p4")
-endif()
+set(ENV{BUILD_BOARD} ${BUILD_BOARD})
 
 set(COMPONENTS main) # "Trim" the build. Include the minimal set of components; main and anything it depends on.
 

apps/calculator/CMakeLists.txt

@@ -7,20 +7,7 @@ if(NOT DEFINED BUILD_BOARD)
     message(FATAL_ERROR "BUILD_BOARD CMake variable is not set")
 endif()
 
-set(ENV{USE_ESP_BOX} "0")
-set(ENV{USE_ESP_BOX_3} "0")
-set(ENV{USE_M5STACK_CORE_S3} "0")
-set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "0")
-
-if (BUILD_BOARD STREQUAL "esp-box")
-    set(ENV{USE_ESP_BOX} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp-box-3")
-    set(ENV{USE_ESP_BOX_3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "m5stack_core_s3")
-    set(ENV{USE_M5STACK_CORE_S3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp32_p4_function_ev_board")
-    set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "esp32p4")
-endif()
+set(ENV{BUILD_BOARD} ${BUILD_BOARD})
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(calculator)

apps/calculator/main/idf_component.yml

@@ -1,25 +1,26 @@
 ## IDF Component Manager Manifest File
+# Requires IDF Component Manager 2.x
 dependencies:
   espressif/esp-box-3:
     version: "^1.2.0"
     rules:
-    - if: "target == ${USE_ESP_BOX_3}"
+    - if: "${BUILD_BOARD} == esp-box-3"
   espressif/esp-box:
     version: "3.1.0"
     rules:
-    - if: "target == ${USE_ESP_BOX}"
+    - if: "${BUILD_BOARD} == esp-box"
   espressif/m5stack_core_s3:
     version: "1.1.1"
     rules:
-    - if: "target == ${USE_M5STACK_CORE_S3}"
+    - if: "${BUILD_BOARD} == m5stack_core_s3"
   espressif/esp32_p4_function_ev_board:
     version: "2.0.0"
     rules:
-    - if: "target == ${USE_ESP32_P4_FUNCTION_EV_BOARD}"
+    - if: "${BUILD_BOARD} == esp32_p4_function_ev_board"
   # Workaround for i2c: CONFLICT! driver_ng is not allowed to be used with this old driver
   esp_codec_dev:
     public: true
     version: "==1.1.0"
   ## Required IDF version
   idf:
-    version: ">=5.0.0"
+    version: ">=5.0.0"

apps/game_of_life/CMakeLists.txt

@@ -7,20 +7,7 @@ if(NOT DEFINED BUILD_BOARD)
     message(FATAL_ERROR "BUILD_BOARD CMake variable is not set")
 endif()
 
-set(ENV{USE_ESP_BOX} "0")
-set(ENV{USE_ESP_BOX_3} "0")
-set(ENV{USE_M5STACK_CORE_S3} "0")
-set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "0")
-
-if (BUILD_BOARD STREQUAL "esp-box")
-    set(ENV{USE_ESP_BOX} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp-box-3")
-    set(ENV{USE_ESP_BOX_3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "m5stack_core_s3")
-    set(ENV{USE_M5STACK_CORE_S3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp32_p4_function_ev_board")
-    set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "esp32p4")
-endif()
+set(ENV{BUILD_BOARD} ${BUILD_BOARD})
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(game_of_life)

apps/game_of_life/main/idf_component.yml

@@ -1,25 +1,26 @@
 ## IDF Component Manager Manifest File
+# Requires IDF Component Manager 2.x
 dependencies:
   espressif/esp-box-3:
     version: "^1.2.0"
     rules:
-    - if: "target == ${USE_ESP_BOX_3}"
+    - if: "${BUILD_BOARD} == esp-box-3"
   espressif/esp-box:
     version: "3.1.0"
     rules:
-    - if: "target == ${USE_ESP_BOX}"
+    - if: "${BUILD_BOARD} == esp-box"
   espressif/m5stack_core_s3:
     version: "1.1.1"
     rules:
-    - if: "target == ${USE_M5STACK_CORE_S3}"
+    - if: "${BUILD_BOARD} == m5stack_core_s3"
   espressif/esp32_p4_function_ev_board:
     version: "2.0.0"
     rules:
-    - if: "target == ${USE_ESP32_P4_FUNCTION_EV_BOARD}"
+    - if: "${BUILD_BOARD} == esp32_p4_function_ev_board"
   # Workaround for i2c: CONFLICT! driver_ng is not allowed to be used with this old driver
   esp_codec_dev:
     public: true
     version: "==1.1.0"
   ## Required IDF version
   idf:
-    version: ">=5.0.0"
+    version: ">=5.0.0"

apps/synth_piano/CMakeLists.txt

@@ -7,20 +7,7 @@ if(NOT DEFINED BUILD_BOARD)
     message(FATAL_ERROR "BUILD_BOARD CMake variable is not set")
 endif()
 
-set(ENV{USE_ESP_BOX} "0")
-set(ENV{USE_ESP_BOX_3} "0")
-set(ENV{USE_M5STACK_CORE_S3} "0")
-set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "0")
-
-if (BUILD_BOARD STREQUAL "esp-box")
-    set(ENV{USE_ESP_BOX} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp-box-3")
-    set(ENV{USE_ESP_BOX_3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "m5stack_core_s3")
-    set(ENV{USE_M5STACK_CORE_S3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp32_p4_function_ev_board")
-    set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "esp32p4")
-endif()
+set(ENV{BUILD_BOARD} ${BUILD_BOARD})
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(synth_piano)

apps/synth_piano/main/idf_component.yml

@@ -1,25 +1,26 @@
 ## IDF Component Manager Manifest File
+# Requires IDF Component Manager 2.x
 dependencies:
   espressif/esp-box-3:
     version: "^1.2.0"
     rules:
-    - if: "target == ${USE_ESP_BOX_3}"
+    - if: "${BUILD_BOARD} == esp-box-3"
   espressif/esp-box:
     version: "3.1.0"
     rules:
-    - if: "target == ${USE_ESP_BOX}"
+    - if: "${BUILD_BOARD} == esp-box"
   espressif/m5stack_core_s3:
     version: "1.1.1"
     rules:
-    - if: "target == ${USE_M5STACK_CORE_S3}"
+    - if: "${BUILD_BOARD} == m5stack_core_s3"
   espressif/esp32_p4_function_ev_board:
     version: "2.0.0"
     rules:
-    - if: "target == ${USE_ESP32_P4_FUNCTION_EV_BOARD}"
+    - if: "${BUILD_BOARD} == esp32_p4_function_ev_board"
   # Workaround for i2c: CONFLICT! driver_ng is not allowed to be used with this old driver
   esp_codec_dev:
     public: true
     version: "==1.1.0"
   ## Required IDF version
   idf:
-    version: ">=5.0.0"
+    version: ">=5.0.0"

apps/tic_tac_toe/CMakeLists.txt

@@ -7,20 +7,7 @@ if(NOT DEFINED BUILD_BOARD)
     message(FATAL_ERROR "BUILD_BOARD CMake variable is not set")
 endif()
 
-set(ENV{USE_ESP_BOX} "0")
-set(ENV{USE_ESP_BOX_3} "0")
-set(ENV{USE_M5STACK_CORE_S3} "0")
-set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "0")
-
-if (BUILD_BOARD STREQUAL "esp-box")
-    set(ENV{USE_ESP_BOX} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp-box-3")
-    set(ENV{USE_ESP_BOX_3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "m5stack_core_s3")
-    set(ENV{USE_M5STACK_CORE_S3} "esp32s3")
-elseif (BUILD_BOARD STREQUAL "esp32_p4_function_ev_board")
-    set(ENV{USE_ESP32_P4_FUNCTION_EV_BOARD} "esp32p4")
-endif()
+set(ENV{BUILD_BOARD} ${BUILD_BOARD})
 
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(tic_tac_toe)

apps/tic_tac_toe/main/idf_component.yml

@@ -1,25 +1,26 @@
 ## IDF Component Manager Manifest File
+# Requires IDF Component Manager 2.x
 dependencies:
   espressif/esp-box-3:
     version: "^1.2.0"
     rules:
-    - if: "target == ${USE_ESP_BOX_3}"
+    - if: "${BUILD_BOARD} == esp-box-3"
   espressif/esp-box:
     version: "3.1.0"
     rules:
-    - if: "target == ${USE_ESP_BOX}"
+    - if: "${BUILD_BOARD} == esp-box"
   espressif/m5stack_core_s3:
     version: "1.1.1"
     rules:
-    - if: "target == ${USE_M5STACK_CORE_S3}"
+    - if: "${BUILD_BOARD} == m5stack_core_s3"
   espressif/esp32_p4_function_ev_board:
     version: "2.0.0"
     rules:
-    - if: "target == ${USE_ESP32_P4_FUNCTION_EV_BOARD}"
+    - if: "${BUILD_BOARD} == esp32_p4_function_ev_board"
   # Workaround for i2c: CONFLICT! driver_ng is not allowed to be used with this old driver
   esp_codec_dev:
     public: true
     version: "==1.1.0"
   ## Required IDF version
   idf:
-    version: ">=5.0.0"
+    version: ">=5.0.0"

apps/wifi_list/main/idf_component.yml

@@ -1,25 +1,26 @@
 ## IDF Component Manager Manifest File
+# Requires IDF Component Manager 2.x
 dependencies:
   espressif/esp-box-3:
     version: "^1.2.0"
     rules:
-    - if: "target == ${USE_ESP_BOX_3}"
+    - if: "${BUILD_BOARD} == esp-box-3"
   espressif/esp-box:
     version: "3.1.0"
     rules:
-    - if: "target == ${USE_ESP_BOX}"
+    - if: "${BUILD_BOARD} == esp-box"
   espressif/m5stack_core_s3:
     version: "1.1.1"
     rules:
-    - if: "target == ${USE_M5STACK_CORE_S3}"
+    - if: "${BUILD_BOARD} == m5stack_core_s3"
   espressif/esp32_p4_function_ev_board:
     version: "2.0.0"
     rules:
-    - if: "target == ${USE_ESP32_P4_FUNCTION_EV_BOARD}"
+    - if: "${BUILD_BOARD} == esp32_p4_function_ev_board"
   # Workaround for i2c: CONFLICT! driver_ng is not allowed to be used with this old driver
   esp_codec_dev:
     public: true
     version: "==1.1.0"
   ## Required IDF version
   idf:
-    version: ">=5.0.0"
+    version: ">=5.0.0"

main/idf_component.yml

@@ -1,25 +1,26 @@
 ## IDF Component Manager Manifest File
+# Requires IDF Component Manager 2.x
 dependencies:
   espressif/esp-box-3:
     version: "^1.2.0"
     rules:
-    - if: "target == ${USE_ESP_BOX_3}"
+    - if: "${BUILD_BOARD} == esp-box-3"
   espressif/esp-box:
     version: "3.1.0"
     rules:
-    - if: "target == ${USE_ESP_BOX}"
+    - if: "${BUILD_BOARD} == esp-box"
   espressif/m5stack_core_s3:
     version: "1.1.1"
     rules:
-    - if: "target == ${USE_M5STACK_CORE_S3}"
+    - if: "${BUILD_BOARD} == m5stack_core_s3"
   espressif/esp32_p4_function_ev_board:
     version: "2.0.0"
     rules:
-    - if: "target == ${USE_ESP32_P4_FUNCTION_EV_BOARD}"
+    - if: "${BUILD_BOARD} == esp32_p4_function_ev_board"
   # Workaround for i2c: CONFLICT! driver_ng is not allowed to be used with this old driver
   esp_codec_dev:
     public: true
     version: "==1.1.0"
   ## Required IDF version
   idf:
-    version: ">=5.0.0"
+    version: ">=5.0.0"