From 8dd931ab277b7cd923bedd0efd1f2ea139957bb7 Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Sun, 14 Oct 2018 09:43:22 +0200 Subject: [PATCH] Fix cyclic linking dependency when using MBEDTLS --- contrib/ports/unix/example_app/CMakeLists.txt | 2 +- contrib/ports/win32/example_app/CMakeLists.txt | 2 +- src/Filelists.cmake | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/ports/unix/example_app/CMakeLists.txt b/contrib/ports/unix/example_app/CMakeLists.txt index 5fa92862..c5e94309 100644 --- a/contrib/ports/unix/example_app/CMakeLists.txt +++ b/contrib/ports/unix/example_app/CMakeLists.txt @@ -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_compile_options(example_app PRIVATE ${LWIP_COMPILER_FLAGS}) 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}) target_compile_options(makefsdata PRIVATE ${LWIP_COMPILER_FLAGS}) diff --git a/contrib/ports/win32/example_app/CMakeLists.txt b/contrib/ports/win32/example_app/CMakeLists.txt index 34a9221e..417e2a48 100644 --- a/contrib/ports/win32/example_app/CMakeLists.txt +++ b/contrib/ports/win32/example_app/CMakeLists.txt @@ -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_compile_options(example_app PRIVATE ${LWIP_COMPILER_FLAGS}) 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}) target_compile_options(makefsdata PRIVATE ${LWIP_COMPILER_FLAGS}) diff --git a/src/Filelists.cmake b/src/Filelists.cmake index 803d3f67..21830332 100644 --- a/src/Filelists.cmake +++ b/src/Filelists.cmake @@ -245,7 +245,6 @@ set(lwipallapps_SRCS ${lwipnetbios_SRCS} ${lwiptftp_SRCS} ${lwipmqtt_SRCS} - ${lwipmbedtls_SRCS} ) # 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_definitions(lwipallapps PRIVATE ${LWIP_DEFINITIONS} ${LWIP_MBEDTLS_DEFINITIONS}) 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})