mirror of https://github.com/ARMmbed/mbed-os.git
Fix build for devices with MESH as the default network type (#361)
parent
44ce17639c
commit
f5417f7bed
|
@ -9,6 +9,9 @@ macro(create_mbed_802_15_4_target)
|
||||||
# Nanostack drivers always require Mbed RTOS
|
# Nanostack drivers always require Mbed RTOS
|
||||||
target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-core-flags mbed-rtos-flags)
|
target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-core-flags mbed-rtos-flags)
|
||||||
|
|
||||||
|
# For NanostackRfPhy.h
|
||||||
|
target_link_libraries(mbed-802.15.4-rf PUBLIC mbed-nanostack)
|
||||||
|
|
||||||
target_link_libraries(mbed-nanostack
|
target_link_libraries(mbed-nanostack
|
||||||
INTERFACE
|
INTERFACE
|
||||||
mbed-802.15.4-rf
|
mbed-802.15.4-rf
|
||||||
|
|
|
@ -34,8 +34,13 @@ target_link_libraries(mbed-nanostack-mbed_mesh_api
|
||||||
PUBLIC
|
PUBLIC
|
||||||
mbed-nanostack-hal_mbed_cmsis_rtos
|
mbed-nanostack-hal_mbed_cmsis_rtos
|
||||||
mbed-nanostack-sal_stack
|
mbed-nanostack-sal_stack
|
||||||
|
mbed-nanostack
|
||||||
mbed-netsocket-api
|
mbed-netsocket-api
|
||||||
mbed-core-flags
|
mbed-core-flags
|
||||||
PRIVATE
|
PRIVATE
|
||||||
mbed-rtos-flags
|
mbed-rtos-flags
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Since there are a lot of circular references between this library and mbed-netsocket-api,
|
||||||
|
# we have to have CMake repeat the libraries on the link line multiple times.
|
||||||
|
set_property(TARGET mbed-nanostack-mbed_mesh_api PROPERTY LINK_INTERFACE_MULTIPLICITY 3)
|
|
@ -69,6 +69,12 @@ if("MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=CELLULAR" IN_LIST MBED_CONFI
|
||||||
target_link_libraries(mbed-netsocket-api PUBLIC mbed-cellular)
|
target_link_libraries(mbed-netsocket-api PUBLIC mbed-cellular)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Similarly if mesh networking is used bring in that library
|
||||||
|
if("MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE=MESH" IN_LIST MBED_CONFIG_DEFINITIONS)
|
||||||
|
target_link_libraries(mbed-netsocket-api PUBLIC mbed-nanostack-mbed_mesh_api)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
|
if("DEVICE_EMAC=1" IN_LIST MBED_TARGET_DEFINITIONS)
|
||||||
target_link_libraries(mbed-netsocket-api
|
target_link_libraries(mbed-netsocket-api
|
||||||
INTERFACE
|
INTERFACE
|
||||||
|
|
Loading…
Reference in New Issue