diff options
| author | Maureen Helm <maureen.helm@nxp.com> | 2020-11-10 19:05:30 -0600 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-02-16 18:38:13 +1100 |
| commit | dff6fc64d23c548dce2b43096c3f1522db303de8 (patch) | |
| tree | a956b22d017c076e2221507c54b6379f2197ea14 /py/mkrules.cmake | |
| parent | 2aa57931a6e23e39adddc717c25fa8a499966cb9 (diff) | |
py: Expand lists in core cmake custom commands.
The core cmake rules use custom commands to invoke qstr processing
scripts. For the zephyr port, it's possible that list arguments to these
commands may contain generator expressions, therefore we need to expand
them properly.
Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
Diffstat (limited to 'py/mkrules.cmake')
| -rw-r--r-- | py/mkrules.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/py/mkrules.cmake b/py/mkrules.cmake index bdff38581..e05dcb836 100644 --- a/py/mkrules.cmake +++ b/py/mkrules.cmake @@ -73,6 +73,7 @@ add_custom_command( DEPENDS ${MICROPY_MODULEDEFS} ${MICROPY_SOURCE_QSTR} VERBATIM + COMMAND_EXPAND_LISTS ) add_custom_command( @@ -81,6 +82,7 @@ add_custom_command( COMMAND touch ${MICROPY_QSTR_DEFS_SPLIT} DEPENDS ${MICROPY_QSTR_DEFS_LAST} VERBATIM + COMMAND_EXPAND_LISTS ) add_custom_command( @@ -88,6 +90,7 @@ add_custom_command( COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdefs.py cat qstr _ ${MICROPY_GENHDR_DIR}/qstr ${MICROPY_QSTR_DEFS_COLLECTED} DEPENDS ${MICROPY_QSTR_DEFS_SPLIT} VERBATIM + COMMAND_EXPAND_LISTS ) add_custom_command( @@ -95,6 +98,7 @@ add_custom_command( COMMAND cat ${MICROPY_PY_QSTRDEFS} ${MICROPY_QSTR_DEFS_COLLECTED} | sed "s/^Q(.*)/\"&\"/" | ${CMAKE_C_COMPILER} -E ${MICROPY_CPP_FLAGS} - | sed "s/^\\\"\\(Q(.*)\\)\\\"/\\1/" > ${MICROPY_QSTR_DEFS_PREPROCESSED} DEPENDS ${MICROPY_QSTR_DEFS_COLLECTED} VERBATIM + COMMAND_EXPAND_LISTS ) add_custom_command( @@ -102,6 +106,7 @@ add_custom_command( COMMAND ${Python3_EXECUTABLE} ${MICROPY_PY_DIR}/makeqstrdata.py ${MICROPY_QSTR_DEFS_PREPROCESSED} > ${MICROPY_QSTR_DEFS_GENERATED} DEPENDS ${MICROPY_QSTR_DEFS_PREPROCESSED} VERBATIM + COMMAND_EXPAND_LISTS ) # Build frozen code if enabled |