diff options
| author | Damien George <damien@micropython.org> | 2021-05-22 22:09:25 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-05-23 00:00:39 +1000 |
| commit | e61ac453dcabaeca2406f1fb6ef113522f341aa2 (patch) | |
| tree | f335c6ded6ea522678bc19f113b15edc286cfdd4 | |
| parent | a7a9f2fe897d2c4e3c18618c996460224df08114 (diff) | |
py/mkrules.cmake: Add MPY_LIB_DIR and BOARD_DIR to makemanifest call.
So that the FROZEN_MANIFEST option in cmake works the same as make.
Signed-off-by: Damien George <damien@micropython.org>
| -rw-r--r-- | py/mkrules.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/py/mkrules.cmake b/py/mkrules.cmake index f20240c62..7589255b2 100644 --- a/py/mkrules.cmake +++ b/py/mkrules.cmake @@ -125,9 +125,13 @@ if(MICROPY_FROZEN_MANIFEST) MICROPY_MODULE_FROZEN_MPY=\(1\) ) + if(NOT MICROPY_LIB_DIR) + set(MICROPY_LIB_DIR ${MICROPY_DIR}/../micropython-lib) + endif() + add_custom_command( OUTPUT ${MICROPY_FROZEN_CONTENT} - COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST} + COMMAND ${Python3_EXECUTABLE} ${MICROPY_DIR}/tools/makemanifest.py -o ${MICROPY_FROZEN_CONTENT} -v "MPY_DIR=${MICROPY_DIR}" -v "MPY_LIB_DIR=${MICROPY_LIB_DIR}" -v "PORT_DIR=${MICROPY_PORT_DIR}" -v "BOARD_DIR=${MICROPY_BOARD_DIR}" -b "${CMAKE_BINARY_DIR}" -f${MICROPY_CROSS_FLAGS} ${MICROPY_FROZEN_MANIFEST} DEPENDS MICROPY_FORCE_BUILD ${MICROPY_QSTRDEFS_GENERATED} VERBATIM |