move mlib to libs folder
This commit is contained in:
parent
a931b83435
commit
6550fa4583
@ -17,3 +17,5 @@ endif()
|
||||
|
||||
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
|
||||
project(Tactility)
|
||||
|
||||
add_subdirectory(libs/mlib)
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
idf_component_register(
|
||||
INCLUDE_DIRS "."
|
||||
)
|
||||
@ -1,5 +1,8 @@
|
||||
idf_component_register(
|
||||
SRC_DIRS "src"
|
||||
INCLUDE_DIRS "src"
|
||||
REQUIRES mlib mbedtls esp_hw_support nvs_flash
|
||||
REQUIRES mbedtls esp_hw_support nvs_flash
|
||||
)
|
||||
|
||||
target_link_libraries(${COMPONENT_LIB} ${IDF_TARGET_NAME} mlib)
|
||||
|
||||
|
||||
@ -20,7 +20,6 @@ idf_component_register(
|
||||
driver
|
||||
fatfs
|
||||
tactility-core
|
||||
mlib
|
||||
nvs_flash
|
||||
spiffs
|
||||
)
|
||||
@ -30,3 +29,4 @@ spiffs_create_partition_image(assets ${ASSETS_SRC_DIR} FLASH_IN_PROJECT)
|
||||
|
||||
set(CONFIG_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/config")
|
||||
spiffs_create_partition_image(config ${CONFIG_SRC_DIR} FLASH_IN_PROJECT)
|
||||
|
||||
|
||||
4
libs/mlib/CMakeLists.txt
Normal file
4
libs/mlib/CMakeLists.txt
Normal file
@ -0,0 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
add_library(mlib INTERFACE "") # No sources
|
||||
target_include_directories(mlib INTERFACE .)
|
||||
|
||||
@ -14,3 +14,4 @@ idf_component_register(
|
||||
"src/hello_world"
|
||||
REQUIRES ${project_components}
|
||||
)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user