cmake simplify uavcan linking

8 years ago · fd6499baca
21 changed files with 5 additions and 118 deletions
--- a/cmake/configs/nuttx_aerocore2_default.cmake
+++ b/cmake/configs/nuttx_aerocore2_default.cmake
@ -176,14 +176,6 @@ set(config_extra_builtin_cmds
				@@ -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"
--- a/cmake/configs/nuttx_aerofc-v1_default.cmake
+++ b/cmake/configs/nuttx_aerofc-v1_default.cmake
@ -120,9 +120,3 @@ set(config_extra_builtin_cmds
				@@ -120,9 +120,3 @@ set(config_extra_builtin_cmds

 set(config_io_board
 	)
-
-set(config_extra_libs
-	)
-
-set(config_io_extra_libs
-	)
--- a/cmake/configs/nuttx_auav-x21_default.cmake
+++ b/cmake/configs/nuttx_auav-x21_default.cmake
@ -201,14 +201,6 @@ set(config_io_board
				@@ -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"
--- a/cmake/configs/nuttx_crazyflie_default.cmake
+++ b/cmake/configs/nuttx_crazyflie_default.cmake
@ -145,9 +145,6 @@ set(config_extra_builtin_cmds
				@@ -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"
--- a/cmake/configs/nuttx_esc35-v1_default.cmake
+++ b/cmake/configs/nuttx_esc35-v1_default.cmake
@ -86,11 +86,6 @@ set(config_extra_builtin_cmds
				@@ -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"
--- a/cmake/configs/nuttx_mindpx-v2_default.cmake
+++ b/cmake/configs/nuttx_mindpx-v2_default.cmake
@ -204,14 +204,6 @@ set(config_extra_builtin_cmds
				@@ -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"
--- a/cmake/configs/nuttx_px4cannode-v1_default.cmake
+++ b/cmake/configs/nuttx_px4cannode-v1_default.cmake
@ -71,8 +71,3 @@ set(config_module_list
				@@ -71,8 +71,3 @@ set(config_module_list


 )
-
-set(config_extra_libs
-	uavcan
-	uavcan_stm32_driver
-	)
--- a/cmake/configs/nuttx_px4esc-v1_default.cmake
+++ b/cmake/configs/nuttx_px4esc-v1_default.cmake
@ -85,11 +85,6 @@ set(config_extra_builtin_cmds
				@@ -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"
--- a/cmake/configs/nuttx_px4fmu-v1_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v1_default.cmake
@ -174,12 +174,6 @@ set(config_io_board
				@@ -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"
--- a/cmake/configs/nuttx_px4fmu-v2_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_default.cmake
@ -204,14 +204,6 @@ set(config_io_board
				@@ -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"
--- a/cmake/configs/nuttx_px4fmu-v2_test.cmake
+++ b/cmake/configs/nuttx_px4fmu-v2_test.cmake
@ -199,14 +199,6 @@ set(config_io_board
				@@ -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"
--- a/cmake/configs/nuttx_px4fmu-v3_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v3_default.cmake
@ -231,14 +231,6 @@ set(config_io_board
				@@ -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"
--- a/cmake/configs/nuttx_px4fmu-v4_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4_default.cmake
@ -220,14 +220,6 @@ set(config_extra_builtin_cmds
				@@ -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"
--- a/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v4pro_default.cmake
@ -231,14 +231,6 @@ set(config_io_board
				@@ -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"
--- a/cmake/configs/nuttx_px4fmu-v5_default.cmake
+++ b/cmake/configs/nuttx_px4fmu-v5_default.cmake
@ -226,14 +226,6 @@ set(config_extra_builtin_cmds
				@@ -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"
--- a/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
+++ b/cmake/configs/nuttx_px4nucleoF767ZI-v1_default.cmake
@ -184,14 +184,6 @@ set(config_extra_builtin_cmds
				@@ -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"
--- a/cmake/configs/nuttx_tap-v1_default.cmake
+++ b/cmake/configs/nuttx_tap-v1_default.cmake
@ -121,12 +121,6 @@ set(config_extra_builtin_cmds
				@@ -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"
--- a/src/firmware/nuttx/CMakeLists.txt
+++ b/src/firmware/nuttx/CMakeLists.txt
@ -69,7 +69,6 @@ target_link_libraries(firmware_nuttx
				@@ -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)
--- a/src/modules/uavcan/CMakeLists.txt
+++ b/src/modules/uavcan/CMakeLists.txt
@ -81,4 +81,4 @@ px4_add_module(
				@@ -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)
--- a/src/modules/uavcanesc/CMakeLists.txt
+++ b/src/modules/uavcanesc/CMakeLists.txt
@ -82,3 +82,5 @@ px4_add_module(
				@@ -82,3 +82,5 @@ px4_add_module(
 		platforms__common
 		uavcan
 	)
+
+target_link_libraries(modules__uavcanesc uavcan uavcan_stm32_driver)
--- a/src/modules/uavcannode/CMakeLists.txt
+++ b/src/modules/uavcannode/CMakeLists.txt
@ -82,3 +82,5 @@ px4_add_module(
				@@ -82,3 +82,5 @@ px4_add_module(
 		platforms__common
 		uavcan
 	)
+
+target_link_libraries(modules__uavcannode uavcan uavcan_stm32_driver)