Skip to content

Commit 6e44357

Browse files
pikasTechpikasTech
committed
add lvgl to submodule on port/linux for CI
compile pass for lvgl support compile lvgl on CI
1 parent bef27d8 commit 6e44357

26 files changed

Lines changed: 7605 additions & 8 deletions

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "port/linux/package/lvgl/lvgl"]
2+
path = port/linux/package/lvgl/lvgl
3+
url = https://gitee.com/Lyon1998/lvgl

‎port/linux/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ IF(PIKA_CONFIG_ENABLE)
55
ADD_DEFINITIONS(-DPIKA_CONFIG_ENABLE)
66
ENDIF(PIKA_CONFIG_ENABLE)
77
ADD_DEFINITIONS(-DUSE_GOOGLE_TEST=1)
8+
ADD_DEFINITIONS(-DLV_CONF_INCLUDE_SIMPLE=1)
9+
ADD_DEFINITIONS(-DLV_LVGL_H_INCLUDE_SIMPLE=1)
10+
ADD_DEFINITIONS(-DPIKASCRIPT=1)
811
set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
912
set(CMAKE_C_STANDARD 99)
1013
set(CMAKE_C_STANDARD_REQUIRED True)
@@ -34,6 +37,8 @@ include_directories(package/pikascript/pikascript-lib/PikaNN/TinyMaix/include)
3437
include_directories(package/pikascript/pikascript-lib/PikaStdDevice)
3538
# rbg/kcf add ---
3639
include_directories(package/pikascript/pikascript-lib/flashdb)
40+
include_directories(package/lvgl)
41+
include_directories(package/lvgl/lvgl)
3742

3843

3944
include_directories(test)
@@ -42,6 +47,7 @@ include_directories(config)
4247
# include_directories(boot/demo01-led)
4348
add_subdirectory(package/googletest)
4449
add_subdirectory(package/pikascript)
50+
add_subdirectory(package/lvgl)
4551
add_subdirectory(test)
4652
# add_subdirectory(boot/demo01-led)
4753
# add_subdirectory(boot/demo02-add)

‎port/linux/benchmark/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ find_package(benchmark REQUIRED)
88

99
# 链接src生成的lib库和gtest库
1010
target_link_libraries(${BINARY} PUBLIC
11-
-Wl,--whole-archive ${CMAKE_PROJECT_NAME}-core -Wl,--no-whole-archive
11+
-Wl,--whole-archive
12+
${CMAKE_PROJECT_NAME}-core
13+
${CMAKE_PROJECT_NAME}-lvgl
14+
-Wl,--no-whole-archive
1215
gtest
1316
benchmark::benchmark)

‎port/linux/boot/demo06-pikamain/CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@ set(SOURCES ${THIS_SOURCES})
44
add_executable(${BINARY} ${THIS_SOURCES})
55
# 链接src生成的lib库和gtest库
66
target_link_libraries(${BINARY} PUBLIC
7-
-Wl,--whole-archive ${CMAKE_PROJECT_NAME}-core -Wl,--no-whole-archive
7+
-Wl,--whole-archive
8+
${CMAKE_PROJECT_NAME}-core
9+
${CMAKE_PROJECT_NAME}-lvgl
10+
-Wl,--no-whole-archive
811
)

‎port/linux/init.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ ROOT=$PWD
22
reset
33
cp config/pika_config_default.h config/pika_config.h
44

5-
# git submodule init
6-
# git submodule update
5+
git submodule init
6+
git submodule update
77
git config --unset-all core.filemode
88
git config --add core.filemode false
99
chmod +x *.sh

‎port/linux/package/lvgl/CMakeLists.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#设置 BINARY 为项目名IndexProject
2+
set(BINARY ${CMAKE_PROJECT_NAME})
3+
set(CMAKE_C_FLAGS "-Wno-unused-variable")
4+
file(GLOB_RECURSE SOURCES LIST_DIRECTORIES true *.h *.c)
5+
set(SOURCES ${SOURCES})
6+
7+
link_libraries(m)
8+
9+
add_library(${BINARY}-lvgl
10+
STATIC
11+
${SOURCES}
12+
)

0 commit comments

Comments
 (0)