From 147ac8ec720162bf9b21ed62da107ac055e1766b Mon Sep 17 00:00:00 2001 From: Neo Xu Date: Wed, 19 Jun 2024 22:36:01 +0800 Subject: [PATCH] fix(test): fix compile error on macos (#6377) Signed-off-by: Neo Xu --- scripts/install-prerequisites.sh | 8 ++++---- tests/CMakeLists.txt | 26 +++++++++++++++++--------- tests/src/lv_test_conf_full.h | 6 ++++-- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/scripts/install-prerequisites.sh b/scripts/install-prerequisites.sh index d63f6ba5e..471da6ffb 100755 --- a/scripts/install-prerequisites.sh +++ b/scripts/install-prerequisites.sh @@ -8,8 +8,8 @@ sudo dpkg --add-architecture i386 sudo apt update sudo apt install gcc gcc-multilib g++-multilib ninja-build \ -libpng-dev libjpeg-turbo8-dev libfreetype6-dev \ -libglew-dev libglfw3-dev \ -libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 \ -ruby-full gcovr cmake python3 pngquant libinput-dev libxkbcommon-dev libdrm-dev pkg-config + libpng-dev libjpeg-turbo8-dev libfreetype6-dev \ + libglew-dev libglfw3-dev \ + libpng-dev:i386 libjpeg-dev:i386 libfreetype6-dev:i386 \ + ruby-full gcovr cmake python3 pngquant libinput-dev libxkbcommon-dev libdrm-dev pkg-config pip3 install pypng lz4 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 89cf4c3a2..1aa0a5f0b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -337,15 +337,24 @@ if ($ENV{NON_AMD64_BUILD}) endif() # OpenGL ES is required for its driver -if (NOT $ENV{NON_AMD64_BUILD}) - find_package(OpenGL REQUIRED) - find_package(GLEW REQUIRED) - find_package(glfw3 REQUIRED) +if ($ENV{NON_AMD64_BUILD}) + message("Disable OpenGL, GLEW or glfw3 for non-amd64 build") + add_definitions(-DLV_USE_OPENGLES=0) +else() + find_package(OpenGL) + find_package(GLEW) + find_package(glfw3) - # Include directories - include_directories(${OPENGL_INCLUDE_DIR}) - include_directories(${GLEW_INCLUDE_DIRS}) - include_directories(${GLFW_INCLUDE_DIRS}) + if(OpenGL_FOUND AND GLEW_FOUND AND glfw3_FOUND) + # Include directories + include_directories(${OPENGL_INCLUDE_DIR}) + 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() if (NOT LIBINPUT_FOUND) @@ -441,7 +450,6 @@ foreach( test_case_fname ${TEST_CASE_FILES} ) ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} glfw) endif() - target_include_directories(${test_name} PUBLIC ${TEST_INCLUDE_DIRS}) target_compile_options(${test_name} PUBLIC ${LVGL_TESTFILE_COMPILE_OPTIONS}) diff --git a/tests/src/lv_test_conf_full.h b/tests/src/lv_test_conf_full.h index b1f64cbe1..3d30b5db6 100644 --- a/tests/src/lv_test_conf_full.h +++ b/tests/src/lv_test_conf_full.h @@ -135,8 +135,10 @@ #define LV_LIBINPUT_XKB 1 #endif -#if !defined(NON_AMD64_BUILD) && !defined(_MSC_VER) && !defined(_WIN32) - #define LV_USE_OPENGLES 1 +#ifndef LV_USE_OPENGLES + #if !defined(NON_AMD64_BUILD) && !defined(_MSC_VER) && !defined(_WIN32) + #define LV_USE_OPENGLES 1 + #endif #endif #define LV_USE_FREETYPE 1