Skip to content

Commit d4987d3

Browse files
committed
Fix paths
1 parent 867f43f commit d4987d3

File tree

3 files changed

+5
-15
lines changed

3 files changed

+5
-15
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ set(SDKCONFIG_DEFAULTS ${CMAKE_BINARY_DIR}/sdkconfig.combined)
6464

6565
# Build with our custom full.cmake file
6666
set(USER_C_MODULES
67-
${PROJECT_DIR}/src/full.cmake
67+
${CMAKE_CURRENT_LIST_DIR}/src/full.cmake
6868
)
6969

7070
# Include main IDF cmake file.

main/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Set location of base MicroPython directory.
22
if(NOT MICROPY_DIR)
3-
get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../../.. ABSOLUTE)
3+
get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/micropython ABSOLUTE)
44
endif()
55

66
# Set location of the ESP32 port directory.

src/base.cmake

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,17 @@
2424
# THE SOFTWARE.
2525
#/
2626

27-
# Log the PROJECT_DIR value
28-
message (STATUS "PROJECT_DIR=${PROJECT_DIR}")
29-
30-
get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/micropython ABSOLUTE)
27+
if(NOT MICROPY_DIR)
28+
get_filename_component(MICROPY_DIR ${CMAKE_CURRENT_LIST_DIR}/../third_party/micropython ABSOLUTE)
29+
endif()
3130

3231
# `py.cmake` for `micropy_gather_target_properties` macro usage
3332
include(${MICROPY_DIR}/py/py.cmake)
3433

3534
include(${CMAKE_CURRENT_LIST_DIR}/esp_nn.cmake)
3635

37-
get_filename_component(TENSORFLOW_DIR ${PROJECT_DIR}/../../../tensorflow ABSOLUTE)
38-
3936
add_library(microlite INTERFACE)
4037

41-
# needed when we have custom/specialized kernels.
42-
# add_custom_command(
43-
# OUTPUT ${TF_MICROLITE_SPECIALIZED_SRCS}
44-
# COMMAND cd ${TENSORFLOW_DIR} && ${Python3_EXECUTABLE} ${MICROPY_DIR}/py/makeversionhdr.py ${MICROPY_MPVERSION}
45-
# DEPENDS MICROPY_FORCE_BUILD
46-
# )
47-
4838
if (CONFIG_IDF_TARGET)
4939
set(TF_ESP_DIR "${CMAKE_CURRENT_LIST_DIR}/../third_party/esp-tflite-micro")
5040
set(TF_DIR "${TF_ESP_DIR}/tensorflow")

0 commit comments

Comments
 (0)