Skip to content

Commit 18ef131

Browse files
vanwinkeljannashif
vanwinkeljan
authored and
nashif
committed
gui: Move lvgl into a zephyr module
Removed lvgl sources from CMakefile.txt and only keep zephyr glue logic. Further added lvgl module to west.yml. Signed-off-by: Jan Van Winkel <[email protected]>
1 parent eb07943 commit 18ef131

File tree

2 files changed

+3
-146
lines changed

2 files changed

+3
-146
lines changed

‎lib/gui/lvgl/CMakeLists.txt‎

Lines changed: 0 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -1,157 +1,11 @@
11
# SPDX-License-Identifier: Apache-2.0
22

3-
include(FetchContent)
4-
5-
set(lv_name lvgl)
6-
7-
set(ep_base ${PROJECT_BINARY_DIR}/ext_proj)
8-
set_property(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
9-
10-
set(lv_SOURCE_DIR ${ep_base}/Source/${lv_name})
11-
set(lv_SUBBUILD_DIR ${ep_base}/Subbuild/${lv_name})
12-
13-
FetchContent_Declare(
14-
${lv_name}
15-
GIT_REPOSITORY https://github.com/littlevgl/lvgl.git
16-
GIT_TAG v5.3
17-
SOURCE_DIR ${lv_SOURCE_DIR}
18-
BINARY_DIR ${lv_SOURCE_DIR}
19-
SUBBUILD_DIR ${lv_SUBBUILD_DIR}
20-
)
21-
22-
FetchContent_GetProperties(${lv_name})
23-
if(NOT ${lv_name}_POPULATED)
24-
FetchContent_Populate(${lv_name})
25-
endif()
26-
273
zephyr_interface_library_named(lvgl)
284

29-
set(LVGL_SOURCE_DIR ${${lv_name}_SOURCE_DIR})
30-
31-
target_include_directories(lvgl INTERFACE ${LVGL_SOURCE_DIR})
325
target_include_directories(lvgl INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
336

34-
zephyr_compile_definitions(LV_CONF_INCLUDE_SIMPLE=1)
35-
367
zephyr_library()
378

38-
zephyr_library_sources(
39-
40-
${LVGL_SOURCE_DIR}/lv_core/lv_group.c
41-
${LVGL_SOURCE_DIR}/lv_core/lv_indev.c
42-
${LVGL_SOURCE_DIR}/lv_core/lv_lang.c
43-
${LVGL_SOURCE_DIR}/lv_core/lv_obj.c
44-
${LVGL_SOURCE_DIR}/lv_core/lv_refr.c
45-
${LVGL_SOURCE_DIR}/lv_core/lv_style.c
46-
${LVGL_SOURCE_DIR}/lv_core/lv_vdb.c
47-
48-
${LVGL_SOURCE_DIR}/lv_draw/lv_draw.c
49-
${LVGL_SOURCE_DIR}/lv_draw/lv_draw_arc.c
50-
${LVGL_SOURCE_DIR}/lv_draw/lv_draw_img.c
51-
${LVGL_SOURCE_DIR}/lv_draw/lv_draw_label.c
52-
${LVGL_SOURCE_DIR}/lv_draw/lv_draw_line.c
53-
${LVGL_SOURCE_DIR}/lv_draw/lv_draw_rbasic.c
54-
${LVGL_SOURCE_DIR}/lv_draw/lv_draw_rect.c
55-
${LVGL_SOURCE_DIR}/lv_draw/lv_draw_triangle.c
56-
${LVGL_SOURCE_DIR}/lv_draw/lv_draw_vbasic.c
57-
58-
${LVGL_SOURCE_DIR}/lv_hal/lv_hal_disp.c
59-
${LVGL_SOURCE_DIR}/lv_hal/lv_hal_indev.c
60-
${LVGL_SOURCE_DIR}/lv_hal/lv_hal_tick.c
61-
62-
${LVGL_SOURCE_DIR}/lv_misc/lv_anim.c
63-
${LVGL_SOURCE_DIR}/lv_misc/lv_area.c
64-
${LVGL_SOURCE_DIR}/lv_misc/lv_circ.c
65-
${LVGL_SOURCE_DIR}/lv_misc/lv_color.c
66-
${LVGL_SOURCE_DIR}/lv_misc/lv_font.c
67-
${LVGL_SOURCE_DIR}/lv_misc/lv_fs.c
68-
${LVGL_SOURCE_DIR}/lv_misc/lv_gc.c
69-
${LVGL_SOURCE_DIR}/lv_misc/lv_ll.c
70-
${LVGL_SOURCE_DIR}/lv_misc/lv_log.c
71-
${LVGL_SOURCE_DIR}/lv_misc/lv_math.c
72-
${LVGL_SOURCE_DIR}/lv_misc/lv_mem.c
73-
${LVGL_SOURCE_DIR}/lv_misc/lv_task.c
74-
${LVGL_SOURCE_DIR}/lv_misc/lv_templ.c
75-
${LVGL_SOURCE_DIR}/lv_misc/lv_txt.c
76-
77-
${LVGL_SOURCE_DIR}/lv_objx/lv_arc.c
78-
${LVGL_SOURCE_DIR}/lv_objx/lv_bar.c
79-
${LVGL_SOURCE_DIR}/lv_objx/lv_btn.c
80-
${LVGL_SOURCE_DIR}/lv_objx/lv_btnm.c
81-
${LVGL_SOURCE_DIR}/lv_objx/lv_calendar.c
82-
${LVGL_SOURCE_DIR}/lv_objx/lv_canvas.c
83-
${LVGL_SOURCE_DIR}/lv_objx/lv_cb.c
84-
${LVGL_SOURCE_DIR}/lv_objx/lv_chart.c
85-
${LVGL_SOURCE_DIR}/lv_objx/lv_cont.c
86-
${LVGL_SOURCE_DIR}/lv_objx/lv_ddlist.c
87-
${LVGL_SOURCE_DIR}/lv_objx/lv_gauge.c
88-
${LVGL_SOURCE_DIR}/lv_objx/lv_img.c
89-
${LVGL_SOURCE_DIR}/lv_objx/lv_imgbtn.c
90-
${LVGL_SOURCE_DIR}/lv_objx/lv_kb.c
91-
${LVGL_SOURCE_DIR}/lv_objx/lv_label.c
92-
${LVGL_SOURCE_DIR}/lv_objx/lv_led.c
93-
${LVGL_SOURCE_DIR}/lv_objx/lv_line.c
94-
${LVGL_SOURCE_DIR}/lv_objx/lv_list.c
95-
${LVGL_SOURCE_DIR}/lv_objx/lv_lmeter.c
96-
${LVGL_SOURCE_DIR}/lv_objx/lv_mbox.c
97-
${LVGL_SOURCE_DIR}/lv_objx/lv_objx_templ.c
98-
${LVGL_SOURCE_DIR}/lv_objx/lv_page.c
99-
${LVGL_SOURCE_DIR}/lv_objx/lv_preload.c
100-
${LVGL_SOURCE_DIR}/lv_objx/lv_roller.c
101-
${LVGL_SOURCE_DIR}/lv_objx/lv_slider.c
102-
${LVGL_SOURCE_DIR}/lv_objx/lv_spinbox.c
103-
${LVGL_SOURCE_DIR}/lv_objx/lv_sw.c
104-
${LVGL_SOURCE_DIR}/lv_objx/lv_ta.c
105-
${LVGL_SOURCE_DIR}/lv_objx/lv_table.c
106-
${LVGL_SOURCE_DIR}/lv_objx/lv_tabview.c
107-
${LVGL_SOURCE_DIR}/lv_objx/lv_tileview.c
108-
${LVGL_SOURCE_DIR}/lv_objx/lv_win.c
109-
110-
${LVGL_SOURCE_DIR}/lv_themes/lv_theme.c
111-
${LVGL_SOURCE_DIR}/lv_themes/lv_theme_alien.c
112-
${LVGL_SOURCE_DIR}/lv_themes/lv_theme_default.c
113-
${LVGL_SOURCE_DIR}/lv_themes/lv_theme_material.c
114-
${LVGL_SOURCE_DIR}/lv_themes/lv_theme_mono.c
115-
${LVGL_SOURCE_DIR}/lv_themes/lv_theme_nemo.c
116-
${LVGL_SOURCE_DIR}/lv_themes/lv_theme_night.c
117-
${LVGL_SOURCE_DIR}/lv_themes/lv_theme_templ.c
118-
${LVGL_SOURCE_DIR}/lv_themes/lv_theme_zen.c
119-
120-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_builtin.c
121-
)
122-
123-
zephyr_library_sources_ifdef( CONFIG_LVGL_BUILD_IN_FONT_10
124-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_10.c
125-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_10_cyrillic.c
126-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_10_latin_sup.c
127-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_symbol_10.c
128-
)
129-
130-
zephyr_library_sources_ifdef( CONFIG_LVGL_BUILD_IN_FONT_20
131-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_20.c
132-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_20_cyrillic.c
133-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_20_latin_sup.c
134-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_symbol_20.c
135-
)
136-
137-
zephyr_library_sources_ifdef( CONFIG_LVGL_BUILD_IN_FONT_30
138-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_30.c
139-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_30_cyrillic.c
140-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_30_latin_sup.c
141-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_symbol_30.c
142-
)
143-
144-
zephyr_library_sources_ifdef( CONFIG_LVGL_BUILD_IN_FONT_40
145-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_40.c
146-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_40_cyrillic.c
147-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_dejavu_40_latin_sup.c
148-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_symbol_40.c
149-
)
150-
151-
zephyr_library_sources_ifdef( CONFIG_LVGL_BUILD_IN_FONT_MONOSPACE
152-
${LVGL_SOURCE_DIR}/lv_fonts/lv_font_monospace_8.c
153-
)
154-
1559
zephyr_library_sources_ifdef( CONFIG_LVGL_COLOR_DEPTH_32
15610
lvgl_color_32.c
15711
)

‎west.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ manifest:
5656
- name: libmetal
5757
revision: 45e630d6152824f807d3f919958605c4626cbdff
5858
path: modules/hal/libmetal
59+
- name: lvgl
60+
revision: c43a2bbe52cc803d12bc12888b38105cf1e179d0
61+
path: modules/lib/gui/lvgl
5962
- name: mbedtls
6063
revision: ca32746072ce3381f1c9ae46ba6cd34c69f8c0ee
6164
path: modules/crypto/mbedtls

0 commit comments

Comments
 (0)