Merge pull request espressif#177 from espressif/fix/lvgl_port_touch_d…

…ependency esp_lvgl_port: Removed touch dependency from LVGL port.
Jerry-ESP · Jun 8, 2023 · 22aa831 · 22aa831
2 parents bf0ba8e + 4e39747
commit 22aa831
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/components/esp_lvgl_port/CMakeLists.txt b/components/esp_lvgl_port/CMakeLists.txt
@@ -3,4 +3,13 @@ idf_component_register(SRCS "esp_lvgl_port.c" INCLUDE_DIRS "include" REQUIRES "e
 idf_build_get_property(build_components BUILD_COMPONENTS)
 if("espressif__button" IN_LIST build_components)
     target_link_libraries(${COMPONENT_LIB} PRIVATE idf::espressif__button)
+endif()
+if("button" IN_LIST build_components)
+    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::button)
+endif()
+if("espressif__esp_lcd_touch" IN_LIST build_components)
+    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::espressif__esp_lcd_touch)
+endif()
+if("esp_lcd_touch" IN_LIST build_components)
+    target_link_libraries(${COMPONENT_LIB} PRIVATE idf::esp_lcd_touch)
 endif()
diff --git a/components/esp_lvgl_port/idf_component.yml b/components/esp_lvgl_port/idf_component.yml
@@ -1,10 +1,8 @@
-version: "1.1.0"
+version: "1.1.1"
 description: ESP LVGL port
 url: https://github.com/espressif/esp-bsp/tree/master/components/esp_lvgl_port
 dependencies:
   idf: ">=4.4"
   lvgl/lvgl:
     version: "^8"
     public: true
-  esp_lcd_touch:
-    version: "^1.0"