move mlib to libs folder

2026-02-18 10:53:17 +00:00 · 2024-01-17 21:45:57 +01:00 · 2024-01-17 21:45:57 +01:00 · 6550fa4583
commit 6550fa4583
parent a931b83435
39 changed files with 12 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -17,3 +17,5 @@ endif()

 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(Tactility)
+
+add_subdirectory(libs/mlib)
--- a/components/mlib/CMakeLists.txt
+++ b/components/mlib/CMakeLists.txt
@ -1,3 +0,0 @@
-idf_component_register(
-    INCLUDE_DIRS "."
-)
--- a/components/tactility-core/CMakeLists.txt
+++ b/components/tactility-core/CMakeLists.txt
@ -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)
+
--- a/components/tactility/CMakeLists.txt
+++ b/components/tactility/CMakeLists.txt
@ -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)
+
--- a/libs/mlib/CMakeLists.txt
+++ b/libs/mlib/CMakeLists.txt
@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.16)
+add_library(mlib INTERFACE "") # No sources
+target_include_directories(mlib INTERFACE .)
+
--- a/components/mlib/LICENSE
+++ b/components/mlib/LICENSE
--- a/components/mlib/README.md
+++ b/components/mlib/README.md
--- a/components/mlib/m-algo.h
+++ b/components/mlib/m-algo.h
--- a/components/mlib/m-array.h
+++ b/components/mlib/m-array.h
--- a/components/mlib/m-atomic.h
+++ b/components/mlib/m-atomic.h
--- a/components/mlib/m-bitset.h
+++ b/components/mlib/m-bitset.h
--- a/components/mlib/m-bptree.h
+++ b/components/mlib/m-bptree.h
--- a/components/mlib/m-buffer.h
+++ b/components/mlib/m-buffer.h
--- a/components/mlib/m-c-mempool.h
+++ b/components/mlib/m-c-mempool.h
--- a/components/mlib/m-concurrent.h
+++ b/components/mlib/m-concurrent.h
--- a/components/mlib/m-core.h
+++ b/components/mlib/m-core.h
--- a/components/mlib/m-deque.h
+++ b/components/mlib/m-deque.h
--- a/components/mlib/m-dict.h
+++ b/components/mlib/m-dict.h
--- a/components/mlib/m-funcobj.h
+++ b/components/mlib/m-funcobj.h
--- a/components/mlib/m-genint.h
+++ b/components/mlib/m-genint.h
--- a/components/mlib/m-i-list.h
+++ b/components/mlib/m-i-list.h
--- a/components/mlib/m-i-shared.h
+++ b/components/mlib/m-i-shared.h
--- a/components/mlib/m-list.h
+++ b/components/mlib/m-list.h
--- a/components/mlib/m-mempool.h
+++ b/components/mlib/m-mempool.h
--- a/components/mlib/m-mutex.h
+++ b/components/mlib/m-mutex.h
--- a/components/mlib/m-prioqueue.h
+++ b/components/mlib/m-prioqueue.h
--- a/components/mlib/m-rbtree.h
+++ b/components/mlib/m-rbtree.h
--- a/components/mlib/m-serial-bin.h
+++ b/components/mlib/m-serial-bin.h
--- a/components/mlib/m-serial-json.h
+++ b/components/mlib/m-serial-json.h
--- a/components/mlib/m-shared.h
+++ b/components/mlib/m-shared.h
--- a/components/mlib/m-snapshot.h
+++ b/components/mlib/m-snapshot.h
--- a/components/mlib/m-string.h
+++ b/components/mlib/m-string.h
--- a/components/mlib/m-thread.h
+++ b/components/mlib/m-thread.h
--- a/components/mlib/m-tree.h
+++ b/components/mlib/m-tree.h
--- a/components/mlib/m-try.h
+++ b/components/mlib/m-try.h
--- a/components/mlib/m-tuple.h
+++ b/components/mlib/m-tuple.h
--- a/components/mlib/m-variant.h
+++ b/components/mlib/m-variant.h
--- a/components/mlib/m-worker.h
+++ b/components/mlib/m-worker.h
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@ -14,3 +14,4 @@ idf_component_register(
        "src/hello_world"
    REQUIRES ${project_components}
 )
+