UAVCAN improve dependencies within libuavcan submodule

- fixes #8828
7 years ago · f7285e1cfa
3 changed files with 13 additions and 3 deletions
--- a/src/modules/uavcan/CMakeLists.txt
+++ b/src/modules/uavcan/CMakeLists.txt
@ -83,7 +83,9 @@ px4_add_module(
				@@ -83,7 +83,9 @@ px4_add_module(

 	DEPENDS
 		git_uavcan
-		platforms__common
+
+		# within libuavcan
+		libuavcan_dsdlc
 		uavcan
 		uavcan_stm32_driver
 	)
--- a/src/modules/uavcanesc/CMakeLists.txt
+++ b/src/modules/uavcanesc/CMakeLists.txt
@ -80,8 +80,12 @@ px4_add_module(
				@@ -80,8 +80,12 @@ px4_add_module(
 		${PX4_SOURCE_DIR}/src/modules/systemlib/flashparams/flashparams.c
 		${PX4_SOURCE_DIR}/src/modules/systemlib/flashparams/flashfs.c
 	DEPENDS
-		platforms__common
+		git_uavcan
+
+		# within libuavcan
+		libuavcan_dsdlc
 		uavcan
+		uavcan_stm32_driver
 	)

 target_link_libraries(modules__uavcanesc uavcan uavcan_stm32_driver)
--- a/src/modules/uavcannode/CMakeLists.txt
+++ b/src/modules/uavcannode/CMakeLists.txt
@ -79,8 +79,12 @@ px4_add_module(
				@@ -79,8 +79,12 @@ px4_add_module(
 		uavcannode_params.c

 	DEPENDS
-		prebuild_targets
+		git_uavcan
+
+		# within libuavcan
+		libuavcan_dsdlc
 		uavcan
+		uavcan_stm32_driver
 	)

 target_link_libraries(modules__uavcannode PUBLIC uavcan uavcan_stm32_driver)