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
@@ -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"
@@ -120,9 +120,3 @@ set(config_extra_builtin_cmds
set(config_io_board
)
set(config_extra_libs
)
set(config_io_extra_libs
)
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -71,8 +71,3 @@ set(config_module_list
)
set(config_extra_libs
uavcan
uavcan_stm32_driver
)
@@ -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"
@@ -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"
@@ -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
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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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
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
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)
+1 -1
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
View File
@@ -82,3 +82,5 @@ px4_add_module(
platforms__common
uavcan
)
target_link_libraries(modules__uavcanesc uavcan uavcan_stm32_driver)
+2
View File
@@ -82,3 +82,5 @@ px4_add_module(
platforms__common
uavcan
)
target_link_libraries(modules__uavcannode uavcan uavcan_stm32_driver)