From 4667fb2495929465238d47060a7247f7996e76cb Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 6 Jun 2018 16:14:03 +1000 Subject: [PATCH] cmake: Compatibility fixes from Mahavir --- components/nghttp/CMakeLists.txt | 2 -- components/pthread/CMakeLists.txt | 4 ++++ components/wpa_supplicant/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/components/nghttp/CMakeLists.txt b/components/nghttp/CMakeLists.txt index bf3f727468..c7e4b754b8 100644 --- a/components/nghttp/CMakeLists.txt +++ b/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() diff --git a/components/pthread/CMakeLists.txt b/components/pthread/CMakeLists.txt index ad162fe1e1..0b93e09ed4 100644 --- a/components/pthread/CMakeLists.txt +++ b/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() diff --git a/components/wpa_supplicant/CMakeLists.txt b/components/wpa_supplicant/CMakeLists.txt index d349e96be6..e77e3160b4 100644 --- a/components/wpa_supplicant/CMakeLists.txt +++ b/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() -- 2.40.0