Skip to content

Fix build for devices with MESH as the default network type #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Fix build for devices with MESH as the default network type #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions connectivity/drivers/802.15.4_RF/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ macro(create_mbed_802_15_4_target)
# Nanostack drivers always require Mbed RTOS
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
INTERFACE
mbed-802.15.4-rf
Expand Down
5 changes: 5 additions & 0 deletions connectivity/nanostack/mbed-mesh-api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,13 @@ target_link_libraries(mbed-nanostack-mbed_mesh_api
PUBLIC
mbed-nanostack-hal_mbed_cmsis_rtos
mbed-nanostack-sal_stack
mbed-nanostack
mbed-netsocket-api
mbed-core-flags
PRIVATE
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)
6 changes: 6 additions & 0 deletions connectivity/netsocket/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
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)
target_link_libraries(mbed-netsocket-api
INTERFACE
Expand Down
Loading