Using the ${catkin_EXPORTED_TARGETS} macro in all the add_dependencies statements now.