From dd27c3530432ea0b09f01e604bf577f31d8ef841 Mon Sep 17 00:00:00 2001 From: jacqueline Date: Thu, 1 Jun 2023 15:41:47 +1000 Subject: convert lvgl from submodule to a plain old directory --- lib/lvgl | 1 - lib/lvgl/env_support/cmake/micropython.cmake | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) delete mode 160000 lib/lvgl create mode 100644 lib/lvgl/env_support/cmake/micropython.cmake (limited to 'lib/lvgl/env_support/cmake/micropython.cmake') diff --git a/lib/lvgl b/lib/lvgl deleted file mode 160000 index 0732400e..00000000 --- a/lib/lvgl +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0732400e7b564dd0e7dc4a924619d8e19c5b23a0 diff --git a/lib/lvgl/env_support/cmake/micropython.cmake b/lib/lvgl/env_support/cmake/micropython.cmake new file mode 100644 index 00000000..43ce7c4f --- /dev/null +++ b/lib/lvgl/env_support/cmake/micropython.cmake @@ -0,0 +1,18 @@ +file(GLOB_RECURSE SOURCES ${LVGL_ROOT_DIR}/src/*.c) +file(GLOB_RECURSE EXAMPLE_SOURCES ${LVGL_ROOT_DIR}/examples/*.c) + +# With micropython, build lvgl as interface library, link chain is: +# lvgl_interface [lvgl] → usermod_lvgl_bindings [lv_bindings] → usermod +# [micropython] → firmware [micropython] +add_library(lvgl_interface INTERFACE) +# ${SOURCES} must NOT be given to add_library directly for some reason (won't be +# built) +target_sources(lvgl_interface INTERFACE ${SOURCES}) +# Micropython builds with -Werror; we need to suppress some warnings, such as: +# +# /home/test/build/lv_micropython/ports/rp2/build-PICO/lv_mp.c:29316:16: error: +# 'lv_style_transition_dsc_t_path_xcb_callback' defined but not used +# [-Werror=unused-function] 29316 | STATIC int32_t +# lv_style_transition_dsc_t_path_xcb_callback(const struct _lv_anim_t * arg0) | +# ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +target_compile_options(lvgl_interface INTERFACE -Wno-unused-function) -- cgit v1.2.3