diff --git a/esp32_component/esp-idf/components/pip/CMakeLists.txt b/esp-idf/CMakeLists.txt similarity index 59% rename from esp32_component/esp-idf/components/pip/CMakeLists.txt rename to esp-idf/CMakeLists.txt index 751927f8..56ffa116 100644 --- a/esp32_component/esp-idf/components/pip/CMakeLists.txt +++ b/esp-idf/CMakeLists.txt @@ -1,20 +1,7 @@ set(COMPONENT_SRCS "main.cpp") -set(COMPONENT_ADD_INCLUDEDIRS "pip/lib/main") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/auxiliary") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/code") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/console") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/containers") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/core") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/crypt") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/geo") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/io_devices") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/io_utils") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/math") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/opencl") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/resources") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/system") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/thread") -list(APPEND COMPONENT_ADD_INCLUDEDIRS "pip/lib/main/introspection") +set(COMPONENT_ADD_INCLUDEDIRS "../libs/main") +list(APPEND COMPONENT_ADD_INCLUDEDIRS "../libs/main/containers") +list(APPEND COMPONENT_ADD_INCLUDEDIRS "../libs/main/core") set(COMPONENT_PRIV_REQUIRES pthread lwip freertos vfs spiffs) register_component() set(PIP_FREERTOS ON) @@ -44,6 +31,6 @@ add_compile_options(${IDF_CXX_COMPILE_OPTIONS}) add_definitions(-DESP_PLATFORM) add_definitions(-DGCC_NOT_5_2_0=0) add_definitions(-DHAVE_CONFIG_H) -add_subdirectory(pip) +include(../CMakeLists.txt) target_link_libraries(${COMPONENT_TARGET} pip pip_crypt pip_io_utils pip_compress) diff --git a/esp32_component/esp-idf/components/pip/main.cpp b/esp-idf/main.cpp similarity index 100% rename from esp32_component/esp-idf/components/pip/main.cpp rename to esp-idf/main.cpp diff --git a/esp32_component/esp-idf/miniz.patch b/esp-idf/miniz.patch similarity index 100% rename from esp32_component/esp-idf/miniz.patch rename to esp-idf/miniz.patch