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

fix(thorvg): link lvgl_thorvgl with lvgl

Browse Source 
Signed-off-by: Neo Xu <neo.xu1990@gmail.com>
This commit is contained in:
Neo Xu
2024-02-23 13:24:54 +08:00
parent c81f654026
commit 9b09182fc7
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
env_support/cmake/custom.cmake
View File

@@ -48,12 +48,7 @@ if(NOT LV_CONF_BUILD_DISABLE_THORVG_INTERNAL)
add_library(lvgl_thorvg ${THORVG_SOURCES})
add_library(lvgl::thorvg ALIAS lvgl_thorvg)
target_include_directories(lvgl_thorvg SYSTEM PUBLIC ${LVGL_ROOT_DIR}/src/libs/thorvg)
if(LV_CONF_PATH)
target_compile_definitions(lvgl_thorvg PUBLIC LV_CONF_PATH=${LV_CONF_PATH})
endif()
if(LV_CONF_SKIP)
target_compile_definitions(lvgl_thorvg PUBLIC LV_CONF_SKIP=1)
endif()
target_link_libraries(lvgl_thorvg PUBLIC lvgl)
endif()
# Build LVGL example library
@@ -146,7 +141,7 @@ if(NOT LV_CONF_BUILD_DISABLE_THORVG_INTERNAL)
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS}")
install(
TARGETS lvgl_thorvg
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
@@ -164,7 +159,7 @@ if(NOT LV_CONF_BUILD_DISABLE_DEMOS)
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS}")
install(
TARGETS lvgl_demos
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"
@@ -182,7 +177,7 @@ if(NOT LV_CONF_BUILD_DISABLE_EXAMPLES)
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib"
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
PUBLIC_HEADER "${LVGL_PUBLIC_HEADERS}")
install(
TARGETS lvgl_examples
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}"