zephyr: fix CMakeLists.txt

This commit is contained in:
Maxime Vincent
2021-07-29 12:36:34 +02:00
parent 3f802d19e4
commit 7acbf61e53

View File

@@ -1,6 +1,7 @@
zephyr_interface_library_named(wolfSSL) if(CONFIG_WOLFSSL)
zephyr_interface_library_named(wolfSSL)
if(CONFIG_WOLFSSL_BUILTIN) if(CONFIG_WOLFSSL_BUILTIN)
target_compile_definitions(wolfSSL INTERFACE target_compile_definitions(wolfSSL INTERFACE
WOLFSSL_OPTIONS_FILE="${CONFIG_WOLFSSL_OPTIONS_FILE}" WOLFSSL_OPTIONS_FILE="${CONFIG_WOLFSSL_OPTIONS_FILE}"
) )
@@ -100,7 +101,7 @@ if(CONFIG_WOLFSSL_BUILTIN)
add_definitions(-DWOLFSSL_USER_SETTINGS) add_definitions(-DWOLFSSL_USER_SETTINGS)
add_definitions(-DWOLFSSL_ZEPHYR) add_definitions(-DWOLFSSL_ZEPHYR)
include_directories("${ZEPHYR_CURRENT_MODULE_DIR}/wolfssl") include_directories("${ZEPHYR_CURRENT_MODULE_DIR}/wolfssl")
else() else()
assert(CONFIG_WOLFSSL_LIBRARY "wolfSSL was enabled, but neither BUILTIN or LIBRARY was selected.") assert(CONFIG_WOLFSSL_LIBRARY "wolfSSL was enabled, but neither BUILTIN or LIBRARY was selected.")
# NB: CONFIG_WOLFSSL_LIBRARY is not regression tested and is # NB: CONFIG_WOLFSSL_LIBRARY is not regression tested and is
@@ -118,6 +119,8 @@ else()
# Lib wolfssl depends on libgcc so to allow # Lib wolfssl depends on libgcc so to allow
# wolfssl to link with gcc we need to ensure it is placed # wolfssl to link with gcc we need to ensure it is placed
# after wolfssl_external on the linkers command line. # after wolfssl_external on the linkers command line.
endif() endif()
target_link_libraries(wolfSSL INTERFACE zephyr_interface) target_link_libraries(wolfSSL INTERFACE zephyr_interface)
endif()