Skip to content

Commit ef0e732

Browse files
committed
fix(build): fix LV_CONF_PATH option for CMake
1 parent aba3854 commit ef0e732

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Diff for: micropython.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ target_link_libraries(usermod_lvgl INTERFACE lvgl_interface)
5858
if (DEFINED LV_CONF_DIR)
5959
target_include_directories(usermod INTERFACE ${LV_CONF_DIR})
6060
endif()
61-
target_compile_options(usermod INTERFACE -DLV_CONF_PATH=${LV_CONF_PATH})
61+
target_compile_options(usermod INTERFACE -DLV_CONF_PATH="${LV_CONF_PATH}")
6262
target_link_libraries(usermod INTERFACE usermod_lvgl)
6363

Diff for: mkrules_usermod.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function(lv_bindings)
3838
OUTPUT
3939
${LV_PP}
4040
COMMAND
41-
${CMAKE_C_COMPILER} -E -DPYCPARSER -DLV_CONF_PATH=${LV_CONF_PATH} ${LV_COMPILE_OPTIONS} ${LV_PP_OPTIONS} "${LV_CFLAGS}" -I ${LV_BINDINGS_DIR}/pycparser/utils/fake_libc_include ${MICROPY_CPP_FLAGS} ${LV_INPUT} > ${LV_PP}
41+
${CMAKE_C_COMPILER} -E -DPYCPARSER -DLV_CONF_PATH="${LV_CONF_PATH}" ${LV_COMPILE_OPTIONS} ${LV_PP_OPTIONS} "${LV_CFLAGS}" -I ${LV_BINDINGS_DIR}/pycparser/utils/fake_libc_include ${MICROPY_CPP_FLAGS} ${LV_INPUT} > ${LV_PP}
4242
DEPENDS
4343
${LV_INPUT}
4444
${LV_DEPENDS}
@@ -89,7 +89,7 @@ function(lv_bindings)
8989
OUTPUT
9090
${LV_OUTPUT}
9191
COMMAND
92-
${Python3_EXECUTABLE} ${LV_BINDINGS_DIR}/gen/gen_mpy.py ${LV_GEN_OPTIONS} -DLV_CONF_PATH=${LV_CONF_PATH} -MD ${LV_MPY_METADATA} -E ${LV_PP_FILTERED} ${LV_INPUT} > ${LV_OUTPUT} || (rm -f ${LV_OUTPUT} && /bin/false)
92+
${Python3_EXECUTABLE} ${LV_BINDINGS_DIR}/gen/gen_mpy.py ${LV_GEN_OPTIONS} -DLV_CONF_PATH="${LV_CONF_PATH}" -MD ${LV_MPY_METADATA} -E ${LV_PP_FILTERED} ${LV_INPUT} > ${LV_OUTPUT} || (rm -f ${LV_OUTPUT} && /bin/false)
9393
DEPENDS
9494
${LV_BINDINGS_DIR}/gen/gen_mpy.py
9595
${LV_PP_FILTERED}

0 commit comments

Comments
 (0)