github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(test): fix compile error on macos (#6377)

Browse Source 
Signed-off-by: Neo Xu <neo.xu1990@gmail.com>
This commit is contained in:
Neo Xu
2024-06-19 22:36:01 +08:00
committed by GitHub
parent af6702858c
commit 147ac8ec72
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/install-prerequisites.sh
View File

@@ -8,8 +8,8 @@
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt update sudo apt update
sudo apt install gcc gcc-multilib g++-multilib ninja-build \ sudo apt install gcc gcc-multilib g++-multilib ninja-build \
libpng-dev libjpeg-turbo8-dev libfreetype6-dev \ libpng-dev libjpeg-turbo8-dev libfreetype6-dev \
libglew-dev libglfw3-dev \ libglew-dev libglfw3-dev \
libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 \ libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 \
ruby-full gcovr cmake python3 pngquant libinput-dev libxkbcommon-dev libdrm-dev pkg-config ruby-full gcovr cmake python3 pngquant libinput-dev libxkbcommon-dev libdrm-dev pkg-config
pip3 install pypng lz4 pip3 install pypng lz4

26
tests/CMakeLists.txt
View File

@@ -337,15 +337,24 @@ if ($ENV{NON_AMD64_BUILD})
endif() endif()
# OpenGL ES is required for its driver # OpenGL ES is required for its driver
if (NOT $ENV{NON_AMD64_BUILD}) if ($ENV{NON_AMD64_BUILD})
find_package(OpenGL REQUIRED) message("Disable OpenGL, GLEW or glfw3 for non-amd64 build")
find_package(GLEW REQUIRED) add_definitions(-DLV_USE_OPENGLES=0)
find_package(glfw3 REQUIRED) else()
find_package(OpenGL)
find_package(GLEW)
find_package(glfw3)
# Include directories if(OpenGL_FOUND AND GLEW_FOUND AND glfw3_FOUND)
include_directories(${OPENGL_INCLUDE_DIR}) # Include directories
include_directories(${GLEW_INCLUDE_DIRS}) include_directories(${OPENGL_INCLUDE_DIR})
include_directories(${GLFW_INCLUDE_DIRS}) include_directories(${GLEW_INCLUDE_DIRS})
include_directories(${GLFW_INCLUDE_DIRS})
message("Enable LV_USE_OPENGLES")
else()
message("OpenGL, GLEW or glfw3 not found, defaulting to 0")
add_definitions(-DLV_USE_OPENGLES=0)
endif()
endif() endif()
if (NOT LIBINPUT_FOUND) if (NOT LIBINPUT_FOUND)
@@ -441,7 +450,6 @@ foreach( test_case_fname ${TEST_CASE_FILES} )
${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} glfw) ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} glfw)
endif() endif()
target_include_directories(${test_name} PUBLIC ${TEST_INCLUDE_DIRS}) target_include_directories(${test_name} PUBLIC ${TEST_INCLUDE_DIRS})
target_compile_options(${test_name} PUBLIC ${LVGL_TESTFILE_COMPILE_OPTIONS}) target_compile_options(${test_name} PUBLIC ${LVGL_TESTFILE_COMPILE_OPTIONS})

6
tests/src/lv_test_conf_full.h
View File

@@ -135,8 +135,10 @@
#define LV_LIBINPUT_XKB 1 #define LV_LIBINPUT_XKB 1
#endif #endif
#if !defined(NON_AMD64_BUILD) && !defined(_MSC_VER) && !defined(_WIN32) #ifndef LV_USE_OPENGLES
#define LV_USE_OPENGLES 1 #if !defined(NON_AMD64_BUILD) && !defined(_MSC_VER) && !defined(_WIN32)
#define LV_USE_OPENGLES 1
#endif
#endif #endif
#define LV_USE_FREETYPE 1 #define LV_USE_FREETYPE 1