diff options
| -rw-r--r-- | ports/esp32/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | ports/esp32/main/CMakeLists.txt | 83 |
2 files changed, 46 insertions, 44 deletions
diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt index 7209dd96d..6992737c9 100644 --- a/ports/esp32/CMakeLists.txt +++ b/ports/esp32/CMakeLists.txt @@ -2,9 +2,6 @@ cmake_minimum_required(VERSION 3.12) -# Set the location of this port's directory. -set(MICROPY_PORT_DIR ${CMAKE_SOURCE_DIR}) - # Set the board if it's not already set. if(NOT MICROPY_BOARD) set(MICROPY_BOARD GENERIC) @@ -12,7 +9,7 @@ endif() # Set the board directory and check that it exists. if(NOT MICROPY_BOARD_DIR) - set(MICROPY_BOARD_DIR ${MICROPY_PORT_DIR}/boards/${MICROPY_BOARD}) + set(MICROPY_BOARD_DIR ${CMAKE_CURRENT_LIST_DIR}/boards/${MICROPY_BOARD}) endif() if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake) message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}") @@ -35,7 +32,7 @@ include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake) if (MICROPY_USER_FROZEN_MANIFEST) set(MICROPY_FROZEN_MANIFEST ${MICROPY_USER_FROZEN_MANIFEST}) elseif (NOT MICROPY_FROZEN_MANIFEST) - set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py) + set(MICROPY_FROZEN_MANIFEST ${CMAKE_CURRENT_LIST_DIR}/boards/manifest.py) endif() # Add sdkconfig fragments that depend on the IDF version. diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt index 51e53c202..425d70fdf 100644 --- a/ports/esp32/main/CMakeLists.txt +++ b/ports/esp32/main/CMakeLists.txt @@ -1,6 +1,10 @@ # Set location of base MicroPython directory. if(NOT MICROPY_DIR) - get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../.. ABSOLUTE) + get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE) +endif() + +if(NOT MICROPY_PORT_DIR) + get_filename_component(MICROPY_PORT_DIR ${MICROPY_DIR}/ports/esp32 ABSOLUTE) endif() # Include core source components. @@ -16,7 +20,7 @@ if(NOT CMAKE_BUILD_EARLY_EXPANSION) endif() set(MICROPY_QSTRDEFS_PORT - ${PROJECT_DIR}/qstrdefsport.h + ${MICROPY_PORT_DIR}/qstrdefsport.h ) set(MICROPY_SOURCE_SHARED @@ -48,44 +52,45 @@ set(MICROPY_SOURCE_DRIVERS ) set(MICROPY_SOURCE_PORT - ${PROJECT_DIR}/main.c - ${PROJECT_DIR}/uart.c - ${PROJECT_DIR}/usb.c - ${PROJECT_DIR}/usb_serial_jtag.c - ${PROJECT_DIR}/gccollect.c - ${PROJECT_DIR}/mphalport.c - ${PROJECT_DIR}/fatfs_port.c - ${PROJECT_DIR}/help.c - ${PROJECT_DIR}/machine_bitstream.c - ${PROJECT_DIR}/machine_timer.c - ${PROJECT_DIR}/machine_pin.c - ${PROJECT_DIR}/machine_touchpad.c - ${PROJECT_DIR}/machine_adc.c - ${PROJECT_DIR}/machine_adcblock.c - ${PROJECT_DIR}/machine_dac.c - ${PROJECT_DIR}/machine_i2c.c - ${PROJECT_DIR}/machine_i2s.c - ${PROJECT_DIR}/machine_uart.c - ${PROJECT_DIR}/modmachine.c - ${PROJECT_DIR}/network_common.c - ${PROJECT_DIR}/network_lan.c - ${PROJECT_DIR}/network_ppp.c - ${PROJECT_DIR}/network_wlan.c - ${PROJECT_DIR}/mpnimbleport.c - ${PROJECT_DIR}/modsocket.c - ${PROJECT_DIR}/modesp.c - ${PROJECT_DIR}/esp32_nvs.c - ${PROJECT_DIR}/esp32_partition.c - ${PROJECT_DIR}/esp32_rmt.c - ${PROJECT_DIR}/esp32_ulp.c - ${PROJECT_DIR}/modesp32.c - ${PROJECT_DIR}/machine_hw_spi.c - ${PROJECT_DIR}/machine_wdt.c - ${PROJECT_DIR}/mpthreadport.c - ${PROJECT_DIR}/machine_rtc.c - ${PROJECT_DIR}/machine_sdcard.c - ${PROJECT_DIR}/modespnow.c + main.c + uart.c + usb.c + usb_serial_jtag.c + gccollect.c + mphalport.c + fatfs_port.c + help.c + machine_bitstream.c + machine_timer.c + machine_pin.c + machine_touchpad.c + machine_adc.c + machine_adcblock.c + machine_dac.c + machine_i2c.c + machine_i2s.c + machine_uart.c + modmachine.c + network_common.c + network_lan.c + network_ppp.c + network_wlan.c + mpnimbleport.c + modsocket.c + modesp.c + esp32_nvs.c + esp32_partition.c + esp32_rmt.c + esp32_ulp.c + modesp32.c + machine_hw_spi.c + machine_wdt.c + mpthreadport.c + machine_rtc.c + machine_sdcard.c + modespnow.c ) +list(TRANSFORM MICROPY_SOURCE_PORT PREPEND ${MICROPY_PORT_DIR}/) set(MICROPY_SOURCE_QSTR ${MICROPY_SOURCE_PY} |