Skip to content

Commit 90bab85

Browse files
author
Felix Exner
authored
Merge pull request #132 from UniversalRobots/fix_dependencies
Fix package dependencies
2 parents d498590 + 8f1c475 commit 90bab85

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

ur_dashboard_msgs/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ project(ur_dashboard_msgs)
1010
find_package(catkin REQUIRED COMPONENTS
1111
actionlib_msgs
1212
message_generation
13+
std_msgs
1314
)
1415

1516
## System dependencies are found with CMake's conventions
@@ -111,7 +112,10 @@ generate_messages(
111112
## CATKIN_DEPENDS: catkin_packages dependent projects also need
112113
## DEPENDS: system dependencies of this project that dependent projects also need
113114
catkin_package(
114-
CATKIN_DEPENDS message_runtime actionlib_msgs
115+
CATKIN_DEPENDS
116+
actionlib_msgs
117+
message_runtime
118+
std_msgs
115119
# DEPENDS system_lib
116120
)
117121

ur_dashboard_msgs/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
<exec_depend>message_runtime</exec_depend>
5555

5656
<depend>actionlib_msgs</depend>
57+
<depend>std_msgs</depend>
5758

5859

5960
<!-- The export tag contains other, unspecified, tags -->

ur_robot_driver/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ add_executable(robot_state_helper
138138
target_link_libraries(robot_state_helper ${catkin_LIBRARIES} ur_robot_driver)
139139
add_dependencies(robot_state_helper ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
140140

141-
install(TARGETS ur_robot_driver ur_robot_driver_node robot_state_helper
141+
install(TARGETS ur_robot_driver ur_robot_driver_node robot_state_helper dashboard_client
142142
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
143143
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
144144
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}

ur_robot_driver/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
<exec_depend>robot_state_publisher</exec_depend>
4747
<exec_depend>socat</exec_depend>
4848
<exec_depend>ur_description</exec_depend>
49+
<exec_depend>ur_e_description</exec_depend>
4950
<exec_depend>velocity_controllers</exec_depend>
5051

5152
<export>

0 commit comments

Comments
 (0)