Merge branch 'bugfix/cmake_fixes' into 'feature/cmake'

CMake: Minor fixes

See merge request idf/esp-idf!2513

components/nghttp/CMakeLists.txt

@@ -1,6 +1,4 @@
 set(COMPONENT_ADD_INCLUDEDIRS port/include nghttp2/lib/includes)
 set(COMPONENT_SRCDIRS nghttp2/lib port)
 
-set(COMPONENT_REQUIRES lwip mbedtls)
-
 register_component()

components/pthread/CMakeLists.txt

@@ -2,3 +2,7 @@ set(COMPONENT_SRCDIRS ".")
 set(COMPONENT_ADD_INCLUDEDIRS "include")
 set(COMPONENT_REQUIRES)
 register_component()
+
+if(CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK)
+    target_link_libraries(pthread "-Wl,--wrap=vPortCleanUpTCB")
+endif()

components/wpa_supplicant/CMakeLists.txt

@@ -2,7 +2,7 @@ set(COMPONENT_SRCDIRS src/crypto port src/fast_crypto)
 set(COMPONENT_ADD_INCLUDEDIRS include port/include)
 
 set(COMPONENT_REQUIRES "")
-set(COMPONENT_PRIV_REQUIRES lwip mbedtls)
+set(COMPONENT_PRIV_REQUIRES mbedtls)
 
 register_component()
 

tools/cmake/components.cmake

@@ -46,7 +46,7 @@ function(register_component)
         foreach(src ${COMPONENT_SRCS})
             get_filename_component(abs_src "${src}" ABSOLUTE ${component_dir})
             if("${exclude}" STREQUAL "${abs_src}")  # compare as canonical paths
-                list(REMOVE_ITEM COMPONENT_SRCS src)
+                list(REMOVE_ITEM COMPONENT_SRCS "${src}")
             endif()
         endforeach()
     endforeach()