From e8725c1b7dbbf6a2dfca4224d9ef0711b2161a9f Mon Sep 17 00:00:00 2001 From: Michael Boulet Date: Thu, 28 Jan 2016 12:48:43 -0500 Subject: [PATCH] add dependency to build vesc_msgs before vesc_driver and vesc_ackermann --- vesc_ackermann/CMakeLists.txt | 11 +++++++---- vesc_driver/CMakeLists.txt | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/vesc_ackermann/CMakeLists.txt b/vesc_ackermann/CMakeLists.txt index 9e762e8..fc1a45a 100644 --- a/vesc_ackermann/CMakeLists.txt +++ b/vesc_ackermann/CMakeLists.txt @@ -29,21 +29,24 @@ include_directories( # node executable add_executable(vesc_to_odom_node src/vesc_to_odom_node.cpp src/vesc_to_odom.cpp) +add_dependencies(vesc_to_odom_node ${catkin_EXPORTED_TARGETS}) target_link_libraries(vesc_to_odom_node ${catkin_LIBRARIES} ) add_executable(ackermann_to_vesc_node src/ackermann_to_vesc_node.cpp - src/ackermann_to_vesc.cpp) + src/ackermann_to_vesc.cpp) +add_dependencies(ackermann_to_vesc_node ${catkin_EXPORTED_TARGETS}) target_link_libraries(ackermann_to_vesc_node ${catkin_LIBRARIES} ) # nodelet library add_library(vesc_ackermann_nodelet src/ackermann_to_vesc_nodelet.cpp - src/ackermann_to_vesc.cpp - src/vesc_to_odom_nodelet.cpp - src/vesc_to_odom.cpp) + src/ackermann_to_vesc.cpp + src/vesc_to_odom_nodelet.cpp + src/vesc_to_odom.cpp) +add_dependencies(vesc_ackermann_nodelet ${catkin_EXPORTED_TARGETS}) target_link_libraries(vesc_ackermann_nodelet ${catkin_LIBRARIES} ) diff --git a/vesc_driver/CMakeLists.txt b/vesc_driver/CMakeLists.txt index d0786ab..6baf7ae 100644 --- a/vesc_driver/CMakeLists.txt +++ b/vesc_driver/CMakeLists.txt @@ -31,6 +31,7 @@ add_executable(vesc_driver_node src/vesc_driver_node.cpp src/vesc_interface.cpp src/vesc_packet.cpp src/vesc_packet_factory.cpp) +add_dependencies(vesc_driver_node ${catkin_EXPORTED_TARGETS}) target_link_libraries(vesc_driver_node ${catkin_LIBRARIES} ) @@ -41,6 +42,7 @@ add_library(vesc_driver_nodelet src/vesc_driver_nodelet.cpp src/vesc_interface.cpp src/vesc_packet.cpp src/vesc_packet_factory.cpp) +add_dependencies(vesc_driver_nodelet ${catkin_EXPORTED_TARGETS}) target_link_libraries(vesc_driver_nodelet ${catkin_LIBRARIES} )