Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
CMake: Minor fixes

See merge request idf/esp-idf!2513
This commit is contained in:
Angus Gratton 2018-06-07 09:00:27 +08:00
parent 8c5f1c866b 46b723e5ed
commit 754cd7bd56
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/nghttp/CMakeLists.txt
View file

@ -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()

4
components/pthread/CMakeLists.txt
View file

@ -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()

2
components/wpa_supplicant/CMakeLists.txt
View file

@ -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
tools/cmake/components.cmake
View file

@ -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()