From 8538f8879305313563bd78dd23c690129e0d45a0 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Mon, 18 Jul 2022 21:06:45 +0800 Subject: [PATCH] Minor fix for cmake (#3498) * chore(cmake): correct LV_CONF_INCLUDE_SIMPLE prompt message in custom.cmake Signed-off-by: Xiang Xiao * chore(cmake): remove the duplication statements in esp.cmake Signed-off-by: Xiang Xiao * chore(cmsis): remove README_zh.md reference from gen_pack.sh Signed-off-by: Xiang Xiao --- env_support/cmake/custom.cmake | 2 +- env_support/cmake/esp.cmake | 22 +++++++--------------- env_support/cmsis-pack/gen_pack.sh | 1 - 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/env_support/cmake/custom.cmake b/env_support/cmake/custom.cmake index 561698211..9655199b2 100644 --- a/env_support/cmake/custom.cmake +++ b/env_support/cmake/custom.cmake @@ -4,7 +4,7 @@ option(LV_LVGL_H_INCLUDE_SIMPLE # Option to define LV_CONF_INCLUDE_SIMPLE, default: ON option(LV_CONF_INCLUDE_SIMPLE - "Simple include of \"lv_conf.h\" and \"lv_drv_conf.h\"" ON) + "Use #include \"lv_conf.h\" instead of #include \"../../lv_conf.h\"" ON) # Option to set LV_CONF_PATH, if set parent path LV_CONF_DIR is added to # includes diff --git a/env_support/cmake/esp.cmake b/env_support/cmake/esp.cmake index 4d39a8976..e600d58ef 100644 --- a/env_support/cmake/esp.cmake +++ b/env_support/cmake/esp.cmake @@ -12,14 +12,6 @@ if(LV_MICROPYTHON) ${LVGL_ROOT_DIR}/../ REQUIRES main) - - target_compile_definitions(${COMPONENT_LIB} - INTERFACE "-DLV_CONF_INCLUDE_SIMPLE") - - if(CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM) - target_compile_definitions(${COMPONENT_LIB} - INTERFACE "-DLV_ATTRIBUTE_FAST_MEM=IRAM_ATTR") - endif() else() if(CONFIG_LV_BUILD_EXAMPLES) file(GLOB_RECURSE EXAMPLE_SOURCES ${LVGL_ROOT_DIR}/examples/*.c) @@ -49,11 +41,11 @@ else() idf_component_register(SRCS ${SOURCES} ${EXAMPLE_SOURCES} ${DEMO_SOURCES} INCLUDE_DIRS ${LVGL_ROOT_DIR} ${LVGL_ROOT_DIR}/src ${LVGL_ROOT_DIR}/../ ${LVGL_ROOT_DIR}/examples ${LVGL_ROOT_DIR}/demos) - - target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_CONF_INCLUDE_SIMPLE") - - if(CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM) - target_compile_definitions(${COMPONENT_LIB} - PUBLIC "-DLV_ATTRIBUTE_FAST_MEM=IRAM_ATTR") - endif() +endif() + +target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DLV_CONF_INCLUDE_SIMPLE") + +if(CONFIG_LV_ATTRIBUTE_FAST_MEM_USE_IRAM) + target_compile_definitions(${COMPONENT_LIB} + PUBLIC "-DLV_ATTRIBUTE_FAST_MEM=IRAM_ATTR") endif() diff --git a/env_support/cmsis-pack/gen_pack.sh b/env_support/cmsis-pack/gen_pack.sh index dedba347c..bde8a8c8d 100644 --- a/env_support/cmsis-pack/gen_pack.sh +++ b/env_support/cmsis-pack/gen_pack.sh @@ -53,7 +53,6 @@ PACK_DIRS=" PACK_BASE_FILES=" ../../LICENCE.txt ../../README.md - ../../README_zh.md ../../lvgl.h lv_conf_cmsis.h lv_cmsis_pack.txt