fix(build): fix LV_CONF_PATH option for CMake

lvgl · Feb 11, 2025 · ef0e732 · ef0e732
1 parent aba3854
commit ef0e732
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/micropython.cmake b/micropython.cmake
@@ -58,6 +58,6 @@ target_link_libraries(usermod_lvgl INTERFACE lvgl_interface)
 if (DEFINED LV_CONF_DIR)
     target_include_directories(usermod INTERFACE ${LV_CONF_DIR})
 endif()
-target_compile_options(usermod INTERFACE -DLV_CONF_PATH=${LV_CONF_PATH})
+target_compile_options(usermod INTERFACE -DLV_CONF_PATH="${LV_CONF_PATH}")
 target_link_libraries(usermod INTERFACE usermod_lvgl)
 
diff --git a/mkrules_usermod.cmake b/mkrules_usermod.cmake
@@ -38,7 +38,7 @@ function(lv_bindings)
         OUTPUT 
             ${LV_PP}
         COMMAND
-        ${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}
+        ${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}
         DEPENDS
             ${LV_INPUT}
             ${LV_DEPENDS}
@@ -89,7 +89,7 @@ function(lv_bindings)
         OUTPUT
             ${LV_OUTPUT}
         COMMAND
-            ${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)
+            ${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)
         DEPENDS
             ${LV_BINDINGS_DIR}/gen/gen_mpy.py
             ${LV_PP_FILTERED}