dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

cmake simplify uavcan linking

This commit is contained in:
Daniel Agar 2017-08-22 22:32:47 -04:00 committed by Lorenz Meier
parent fb7b33e755
commit fd6499baca
21 changed files with 5 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/configs/nuttx_aerocore2_default.cmake
View File

@ -176,14 +176,6 @@ set(config_extra_builtin_cmds
sercon
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

6
cmake/configs/nuttx_aerofc-v1_default.cmake
View File

@ -120,9 +120,3 @@ set(config_extra_builtin_cmds
set(config_io_board
)
set(config_extra_libs
)
set(config_io_extra_libs
)

8
cmake/configs/nuttx_auav-x21_default.cmake
View File

@ -201,14 +201,6 @@ set(config_io_board
px4io-v2
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

3
cmake/configs/nuttx_crazyflie_default.cmake
View File

@ -145,9 +145,6 @@ set(config_extra_builtin_cmds
sercon
)
set(config_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

5
cmake/configs/nuttx_esc35-v1_default.cmake
View File

@ -86,11 +86,6 @@ set(config_extra_builtin_cmds
sercon
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

8
cmake/configs/nuttx_mindpx-v2_default.cmake
View File

@ -204,14 +204,6 @@ set(config_extra_builtin_cmds
sercon
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

5
cmake/configs/nuttx_px4cannode-v1_default.cmake
View File

@ -71,8 +71,3 @@ set(config_module_list
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)

5
cmake/configs/nuttx_px4esc-v1_default.cmake
View File

@ -85,11 +85,6 @@ set(config_extra_builtin_cmds
sercon
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

6
cmake/configs/nuttx_px4fmu-v1_default.cmake
View File

@ -174,12 +174,6 @@ set(config_io_board
px4io-v1
)
set(config_extra_libs
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

8
cmake/configs/nuttx_px4fmu-v2_default.cmake
View File

@ -204,14 +204,6 @@ set(config_io_board
px4io-v2
)
#set(config_extra_libs
# uavcan
# uavcan_stm32_driver
# )
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

8
cmake/configs/nuttx_px4fmu-v2_test.cmake
View File

@ -199,14 +199,6 @@ set(config_io_board
px4io-v2
)
#set(config_extra_libs
# uavcan
# uavcan_stm32_driver
# )
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

8
cmake/configs/nuttx_px4fmu-v3_default.cmake
View File

@ -231,14 +231,6 @@ set(config_io_board
px4io-v2
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

8
cmake/configs/nuttx_px4fmu-v4_default.cmake
View File

@ -220,14 +220,6 @@ set(config_extra_builtin_cmds
sercon
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

8
cmake/configs/nuttx_px4fmu-v4pro_default.cmake
View File

@ -231,14 +231,6 @@ set(config_io_board
px4io-v2
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

8
cmake/configs/nuttx_px4fmu-v5_default.cmake
View File

@ -226,14 +226,6 @@ set(config_extra_builtin_cmds
sercon
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

8
cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
View File

@ -184,14 +184,6 @@ set(config_extra_builtin_cmds
sercon
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

6
cmake/configs/nuttx_tap-v1_default.cmake
View File

@ -121,12 +121,6 @@ set(config_extra_builtin_cmds
set(config_io_board
)
set(config_extra_libs
)
set(config_io_extra_libs
)
add_custom_target(sercon)
set_target_properties(sercon PROPERTIES
PRIORITY "SCHED_PRIORITY_DEFAULT"

1
src/firmware/nuttx/CMakeLists.txt
View File

@ -69,7 +69,6 @@ target_link_libraries(firmware_nuttx
${startup_libs}
${module_libraries}
${df_driver_libs}
${config_extra_libs}
${nuttx_bootloader_wrapers}
${link_libs}
-Wl,--end-group)

2
src/modules/uavcan/CMakeLists.txt
View File

@ -81,4 +81,4 @@ px4_add_module(
uavcan
)
## vim: set noet ft=cmake fenc=utf-8 ff=unix :
target_link_libraries(modules__uavcan uavcan uavcan_stm32_driver)

2
src/modules/uavcanesc/CMakeLists.txt
View File

@ -82,3 +82,5 @@ px4_add_module(
platforms__common
uavcan
)
target_link_libraries(modules__uavcanesc uavcan uavcan_stm32_driver)

2
src/modules/uavcannode/CMakeLists.txt
View File

@ -82,3 +82,5 @@ px4_add_module(
platforms__common
uavcan
)
target_link_libraries(modules__uavcannode uavcan uavcan_stm32_driver)