Merge branch 'master' into feature/esp32s2beta_update

components/heap/CMakeLists.txt

@@ -1,23 +1,24 @@
-set(COMPONENT_SRCS "heap_caps.c"
-                   "heap_caps_init.c"
-                   "multi_heap.c")
+set(srcs 
+    "heap_caps.c"
+    "heap_caps_init.c"
+    "multi_heap.c")
 
 if(NOT CONFIG_HEAP_POISONING_DISABLED)
-    list(APPEND COMPONENT_SRCS "multi_heap_poisoning.c")
+    list(APPEND srcs "multi_heap_poisoning.c")
 endif()
 
 if(CONFIG_HEAP_TASK_TRACKING)
-    list(APPEND COMPONENT_SRCS "heap_task_info.c")
+    list(APPEND srcs "heap_task_info.c")
 endif()
 
 if(CONFIG_HEAP_TRACING_STANDALONE)
-    list(APPEND COMPONENT_SRCS "heap_trace_standalone.c")
+    list(APPEND srcs "heap_trace_standalone.c")
 endif()
 
-set(COMPONENT_ADD_INCLUDEDIRS "include")
-set(COMPONENT_ADD_LDFRAGMENTS linker.lf)
-set(COMPONENT_PRIV_REQUIRES soc)
-register_component()
+idf_component_register(SRCS "${srcs}"
+                    INCLUDE_DIRS include
+                    LDFRAGMENTS linker.lf
+                    PRIV_REQUIRES soc)
 
 if(CONFIG_HEAP_TRACING)
     set(WRAP_FUNCTIONS
@@ -32,7 +33,7 @@ if(CONFIG_HEAP_TRACING)
         heap_caps_realloc_default)
 
     foreach(wrap ${WRAP_FUNCTIONS})
-        target_link_libraries(${COMPONENT_LIB} "-Wl,--wrap=${wrap}")
+        target_link_libraries(${COMPONENT_LIB} INTERFACE "-Wl,--wrap=${wrap}")
     endforeach()
 
 endif()

components/heap/test/CMakeLists.txt

@@ -1,6 +1,3 @@
-set(COMPONENT_SRCDIRS ".")
-set(COMPONENT_ADD_INCLUDEDIRS ".")
-
-set(COMPONENT_REQUIRES unity test_utils heap)
-
-register_component()
+idf_component_register(SRC_DIRS "."
+                    INCLUDE_DIRS "."
+                    REQUIRES unity test_utils heap)

components/heap/test/test_malloc.c

@@ -14,7 +14,6 @@
 #include "unity.h"
 #include "esp_heap_caps.h"
 
-#include "esp_debug_helpers.h"
 #include "sdkconfig.h"