mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-08-24 15:16:02 +00:00
Fix cyclic linking dependency when using MBEDTLS
This commit is contained in:
parent
fa76861481
commit
8dd931ab27
|
@ -15,7 +15,7 @@ add_executable(example_app ${LWIP_DIR}/contrib/examples/example_app/test.c defau
|
||||||
target_include_directories(example_app PRIVATE ${LWIP_INCLUDE_DIRS})
|
target_include_directories(example_app PRIVATE ${LWIP_INCLUDE_DIRS})
|
||||||
target_compile_options(example_app PRIVATE ${LWIP_COMPILER_FLAGS})
|
target_compile_options(example_app PRIVATE ${LWIP_COMPILER_FLAGS})
|
||||||
target_compile_definitions(example_app PRIVATE ${LWIP_DEFINITIONS} ${LWIP_MBEDTLS_DEFINITIONS})
|
target_compile_definitions(example_app PRIVATE ${LWIP_DEFINITIONS} ${LWIP_MBEDTLS_DEFINITIONS})
|
||||||
target_link_libraries(example_app ${LWIP_SANITIZER_LIBS} lwipcontribexamples lwipcontribapps lwipcontribaddons lwipallapps lwipcontribportunix lwipcore)
|
target_link_libraries(example_app ${LWIP_SANITIZER_LIBS} lwipcontribexamples lwipcontribapps lwipcontribaddons lwipallapps lwipcontribportunix lwipcore lwipmbedtls)
|
||||||
|
|
||||||
add_executable(makefsdata ${lwipmakefsdata_SRCS})
|
add_executable(makefsdata ${lwipmakefsdata_SRCS})
|
||||||
target_compile_options(makefsdata PRIVATE ${LWIP_COMPILER_FLAGS})
|
target_compile_options(makefsdata PRIVATE ${LWIP_COMPILER_FLAGS})
|
||||||
|
|
|
@ -15,7 +15,7 @@ add_executable(example_app ${LWIP_DIR}/contrib/examples/example_app/test.c defau
|
||||||
target_include_directories(example_app PRIVATE ${LWIP_INCLUDE_DIRS})
|
target_include_directories(example_app PRIVATE ${LWIP_INCLUDE_DIRS})
|
||||||
target_compile_options(example_app PRIVATE ${LWIP_COMPILER_FLAGS})
|
target_compile_options(example_app PRIVATE ${LWIP_COMPILER_FLAGS})
|
||||||
target_compile_definitions(example_app PRIVATE ${LWIP_DEFINITIONS} ${LWIP_MBEDTLS_DEFINITIONS})
|
target_compile_definitions(example_app PRIVATE ${LWIP_DEFINITIONS} ${LWIP_MBEDTLS_DEFINITIONS})
|
||||||
target_link_libraries(example_app ${LWIP_SANITIZER_LIBS} lwipcontribexamples lwipcontribapps lwipcontribaddons lwipallapps lwipcore lwipcontribportwindows)
|
target_link_libraries(example_app ${LWIP_SANITIZER_LIBS} lwipcontribexamples lwipcontribapps lwipcontribaddons lwipallapps lwipcore lwipcontribportwindows lwipmbedtls)
|
||||||
|
|
||||||
add_executable(makefsdata ${lwipmakefsdata_SRCS})
|
add_executable(makefsdata ${lwipmakefsdata_SRCS})
|
||||||
target_compile_options(makefsdata PRIVATE ${LWIP_COMPILER_FLAGS})
|
target_compile_options(makefsdata PRIVATE ${LWIP_COMPILER_FLAGS})
|
||||||
|
|
|
@ -245,7 +245,6 @@ set(lwipallapps_SRCS
|
||||||
${lwipnetbios_SRCS}
|
${lwipnetbios_SRCS}
|
||||||
${lwiptftp_SRCS}
|
${lwiptftp_SRCS}
|
||||||
${lwipmqtt_SRCS}
|
${lwipmqtt_SRCS}
|
||||||
${lwipmbedtls_SRCS}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Generate lwip/init.h (version info)
|
# Generate lwip/init.h (version info)
|
||||||
|
@ -282,3 +281,8 @@ add_library(lwipallapps EXCLUDE_FROM_ALL ${lwipallapps_SRCS})
|
||||||
target_compile_options(lwipallapps PRIVATE ${LWIP_COMPILER_FLAGS})
|
target_compile_options(lwipallapps PRIVATE ${LWIP_COMPILER_FLAGS})
|
||||||
target_compile_definitions(lwipallapps PRIVATE ${LWIP_DEFINITIONS} ${LWIP_MBEDTLS_DEFINITIONS})
|
target_compile_definitions(lwipallapps PRIVATE ${LWIP_DEFINITIONS} ${LWIP_MBEDTLS_DEFINITIONS})
|
||||||
target_include_directories(lwipallapps PRIVATE ${LWIP_INCLUDE_DIRS} ${LWIP_MBEDTLS_INCLUDE_DIRS})
|
target_include_directories(lwipallapps PRIVATE ${LWIP_INCLUDE_DIRS} ${LWIP_MBEDTLS_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
add_library(lwipmbedtls EXCLUDE_FROM_ALL ${lwipmbedtls_SRCS})
|
||||||
|
target_compile_options(lwipmbedtls PRIVATE ${LWIP_COMPILER_FLAGS})
|
||||||
|
target_compile_definitions(lwipmbedtls PRIVATE ${LWIP_DEFINITIONS} ${LWIP_MBEDTLS_DEFINITIONS})
|
||||||
|
target_include_directories(lwipmbedtls PRIVATE ${LWIP_INCLUDE_DIRS} ${LWIP_MBEDTLS_INCLUDE_DIRS})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user