Merge branch 'bugfix/fix_lcd_test_apps' into 'master'

lcd: fix test apps See merge request ae_group/esp-iot-solution!861
espressif · Sep 27, 2023 · 76e4ad4 · 76e4ad4
2 parents 0db18ed + 66d7515
commit 76e4ad4
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 9 deletions.
diff --git a/components/display/lcd/esp_lcd_gc9b71/idf_component.yml b/components/display/lcd/esp_lcd_gc9b71/idf_component.yml
@@ -5,5 +5,6 @@ repository: https://github.com/espressif/esp-iot-solution.git
 issues: https://github.com/espressif/esp-iot-solution/issues
 dependencies:
   idf: ">=5.1.0"
+  cmake_utilities: "0.*"
 examples:
   - path: ../../../../examples/display/lcd/qspi_with_ram
diff --git a/components/display/lcd/esp_lcd_gc9b71/test_apps/CMakeLists.txt b/components/display/lcd/esp_lcd_gc9b71/test_apps/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.5)
-set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components"
-                         "../../")
+set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(test_esp_lcd_gc9b71)
diff --git a/components/display/lcd/esp_lcd_gc9b71/test_apps/main/idf_component.yml b/components/display/lcd/esp_lcd_gc9b71/test_apps/main/idf_component.yml
@@ -3,4 +3,4 @@ dependencies:
   idf: ">=5.1.0"
   esp_lcd_gc9b71:
     version: "*"
-    override_path: "../../"
+    override_path: "../../../esp_lcd_gc9b71"
diff --git a/components/display/lcd/esp_lcd_sh8601/idf_component.yml b/components/display/lcd/esp_lcd_sh8601/idf_component.yml
@@ -5,6 +5,6 @@ repository: https://github.com/espressif/esp-iot-solution.git
 issues: https://github.com/espressif/esp-iot-solution/issues
 dependencies:
   idf: ">=5.1.0"
+  cmake_utilities: "0.*"
 examples:
   - path: ../../../../examples/display/lcd/qspi_with_ram
-
diff --git a/components/display/lcd/esp_lcd_sh8601/test_apps/CMakeLists.txt b/components/display/lcd/esp_lcd_sh8601/test_apps/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.5)
-set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components"
-                         "../../")
+set(EXTRA_COMPONENT_DIRS "$ENV{IDF_PATH}/tools/unit-test-app/components")
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(test_esp_lcd_gc9b71)
diff --git a/components/display/lcd/esp_lcd_sh8601/test_apps/main/idf_component.yml b/components/display/lcd/esp_lcd_sh8601/test_apps/main/idf_component.yml
@@ -3,4 +3,4 @@ dependencies:
   idf: ">=5.1.0"
   esp_lcd_sh8601:
     version: "*"
-    override_path: "../../"
+    override_path: "../../../esp_lcd_sh8601"
diff --git a/components/display/lcd/esp_lcd_spd2010/test_apps/main/idf_component.yml b/components/display/lcd/esp_lcd_spd2010/test_apps/main/idf_component.yml
@@ -3,4 +3,4 @@ dependencies:
   idf: ">=5.1.0"
   esp_lcd_spd2010:
     version: "*"
-    override_path: "../../"
+    override_path: "../../../esp_lcd_spd2010"
diff --git a/components/display/lcd/esp_lcd_st77903/test_apps/main/idf_component.yml b/components/display/lcd/esp_lcd_st77903/test_apps/main/idf_component.yml
@@ -4,4 +4,4 @@ dependencies:
   esp_lcd_panel_io_additions: "^1"
   esp_lcd_st77903:
     version: "*"
-    override_path: "../../"
+    override_path: "../../../esp_lcd_st77903"