diff --git a/aubo_controller/CMakeLists.txt b/aubo_controller/CMakeLists.txt
index c68126a..254373d 100644
--- a/aubo_controller/CMakeLists.txt
+++ b/aubo_controller/CMakeLists.txt
@@ -1,14 +1,27 @@
cmake_minimum_required(VERSION 2.8.3)
project(aubo_controller)
-find_package(catkin REQUIRED COMPONENTS aubo_msgs moveit_core moveit_ros_planning moveit_ros_planning_interface pluginlib cmake_modules)
+find_package(catkin REQUIRED COMPONENTS
+ roscpp
+ std_msgs
+ sensor_msgs
+ control_msgs
+ trajectory_msgs
+ urdf
+ pluginlib
+ actionlib
+ actionlib_msgs
+ moveit_core
+ moveit_ros_planning
+ moveit_ros_planning_interface
+ industrial_utils
+ industrial_msgs
+ cmake_modules
+ aubo_msgs
+)
find_package(Boost REQUIRED system filesystem date_time thread)
-find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs
- control_msgs trajectory_msgs actionlib_msgs actionlib
- urdf industrial_msgs industrial_utils)
-
#find_package(Eigen REQUIRED)
catkin_package(
@@ -17,18 +30,19 @@ catkin_package(
std_msgs
sensor_msgs
control_msgs
- actionlib
- moveit_core
- moveit_ros_planning_interface
- interactive_markers
trajectory_msgs
- industrial_msgs
+ urdf
+ pluginlib
actionlib
actionlib_msgs
+ moveit_core
+ moveit_ros_planning_interface
industrial_utils
- urdf
- INCLUDE_DIRS include
- LIBRARIES ${PROJECT_NAME}_dummy
+ industrial_msgs
+ interactive_markers
+ aubo_msgs
+ INCLUDE_DIRS include
+ LIBRARIES ${PROJECT_NAME}_dummy
)
#CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
@@ -47,7 +61,10 @@ link_directories(${catkin_LIBRARY_DIRS} )
ADD_EXECUTABLE(aubo_joint_trajectory_action src/joint_trajectory_action.cpp)
TARGET_LINK_LIBRARIES(aubo_joint_trajectory_action industrial_robot_client ${catkin_LIBRARIES})
-install(TARGETS aubo_joint_trajectory_action DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+install(
+ TARGETS aubo_joint_trajectory_action
+ DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
#set(${PROJECT_NAME}_SOURCES1
# src/aubo_robot_simulator.cpp
@@ -56,5 +73,7 @@ install(TARGETS aubo_joint_trajectory_action DESTINATION ${CATKIN_PACKAGE_BIN_DE
#TARGET_LINK_LIBRARIES(aubo_simulator_controller industrial_robot_client ${catkin_LIBRARIES})
#install(TARGETS aubo_simulator_controller DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
-catkin_install_python(PROGRAMS script/aubo_controller/aubo_robot_simulator
- DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
+catkin_install_python(
+ PROGRAMS script/aubo_controller/aubo_robot_simulator
+ DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
diff --git a/aubo_controller/package.xml b/aubo_controller/package.xml
index cfe03b1..7b3d980 100644
--- a/aubo_controller/package.xml
+++ b/aubo_controller/package.xml
@@ -10,43 +10,44 @@
http://wiki.ros.org/aubo_trajectory
catkin
+
roscpp
std_msgs
sensor_msgs
control_msgs
trajectory_msgs
- simple_message
- actionlib_msgs
urdf
- industrial_msgs
- industrial_utils
-
- actionlib
pluginlib
+ actionlib
+ actionlib_msgs
moveit_core
moveit_ros_planning_interface
moveit_ros_perception
+ simple_message
+ industrial_utils
+ industrial_msgs
interactive_markers
- cmake_modules
+ aubo_msgs
geometric_shapes
+ cmake_modules
roscpp
std_msgs
sensor_msgs
control_msgs
trajectory_msgs
- simple_message
- actionlib_msgs
- actionlib
urdf
- industrial_msgs
- industrial_utils
-
pluginlib
+ actionlib
+ actionlib_msgs
moveit_core
moveit_fake_controller_manager
moveit_ros_planning_interface
moveit_ros_perception
+ simple_message
+ industrial_utils
+ industrial_msgs
interactive_markers
+ aubo_msgs
diff --git a/aubo_kinematics/CMakeLists.txt b/aubo_kinematics/CMakeLists.txt
index d8176ce..338209d 100644
--- a/aubo_kinematics/CMakeLists.txt
+++ b/aubo_kinematics/CMakeLists.txt
@@ -15,10 +15,21 @@ find_package(Boost REQUIRED COMPONENTS system)
catkin_package(
INCLUDE_DIRS include
- LIBRARIES aubo_i3_kinematic aubo_i5_kinematic aubo_i10_kinematic aubo_i3_moveit_kinematic_plugin aubo_i5_moveit_kinematic_plugin aubo_i10_moveit_kinematic_plugin
- CATKIN_DEPENDS roscpp geometry_msgs moveit_core moveit_ros_planning
- pluginlib tf_conversions
- DEPENDS boost
+ LIBRARIES
+ aubo_i3_kinematic
+ aubo_i3_moveit_kinematic_plugin
+ aubo_i5_kinematic
+ aubo_i5_moveit_kinematic_plugin
+ aubo_i10_kinematic
+ aubo_i10_moveit_kinematic_plugin
+ CATKIN_DEPENDS
+ roscpp
+ geometry_msgs
+ pluginlib
+ moveit_core
+ moveit_ros_planning
+ tf_conversions
+ DEPENDS Boost
)
@@ -103,4 +114,3 @@ install(DIRECTORY include/${PROJECT_NAME}/
install(FILES aubo_moveit_plugins.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
-
diff --git a/aubo_planner/CMakeLists.txt b/aubo_planner/CMakeLists.txt
index 3b56340..743e173 100644
--- a/aubo_planner/CMakeLists.txt
+++ b/aubo_planner/CMakeLists.txt
@@ -1,13 +1,27 @@
cmake_minimum_required(VERSION 2.8.3)
project(aubo_planner)
-find_package(catkin REQUIRED COMPONENTS aubo_msgs moveit_core moveit_ros_planning moveit_ros_planning_interface pluginlib cmake_modules)
+find_package(catkin REQUIRED COMPONENTS
+ roscpp
+ std_msgs
+ sensor_msgs
+ control_msgs
+ urdf
+ pluginlib
+ actionlib
+ actionlib_msgs
+ moveit_core
+ moveit_ros_planning
+ moveit_ros_planning_interface
+ trajectory_msgs
+ industrial_utils
+ industrial_msgs
+ cmake_modules
+ aubo_msgs
+)
find_package(Boost REQUIRED system filesystem date_time thread)
-find_package(catkin REQUIRED COMPONENTS roscpp std_msgs sensor_msgs
- control_msgs trajectory_msgs actionlib_msgs actionlib
- urdf industrial_msgs industrial_utils)
if("$ENV{ROS_DISTRO}" STREQUAL "kinetic")
find_package(Eigen3 REQUIRED)
@@ -25,17 +39,18 @@ catkin_package(
std_msgs
sensor_msgs
control_msgs
+ urdf
+ pluginlib
actionlib
+ actionlib_msgs
moveit_core
moveit_ros_planning_interface
- interactive_markers
trajectory_msgs
- industrial_msgs
- actionlib
- actionlib_msgs
+ interactive_markers
industrial_utils
- urdf
- LIBRARIES ${PROJECT_NAME}_dummy
+ industrial_msgs
+ aubo_msgs
+ LIBRARIES ${PROJECT_NAME}_dummy
)
# check c++11 / c++0x
@@ -65,7 +80,7 @@ if("$ENV{ROS_DISTRO}" STREQUAL "indigo")
Message(STATUS "<<<<<<<<<<<<<<<<<<<<<<<<http://wiki.ros.org/aubo_trajectory
catkin
+
roscpp
std_msgs
sensor_msgs
control_msgs
trajectory_msgs
simple_message
- actionlib_msgs
urdf
industrial_msgs
industrial_utils
- actionlib
pluginlib
+ actionlib
+ actionlib_msgs
moveit_core
moveit_ros_planning_interface
moveit_ros_perception
interactive_markers
cmake_modules
geometric_shapes
+ aubo_msgs
roscpp
std_msgs
@@ -36,17 +38,18 @@
control_msgs
trajectory_msgs
simple_message
- actionlib_msgs
- actionlib
urdf
industrial_msgs
industrial_utils
pluginlib
+ actionlib
+ actionlib_msgs
moveit_core
- moveit_fake_controller_manager
moveit_ros_planning_interface
moveit_ros_perception
+ moveit_fake_controller_manager
interactive_markers
+ aubo_msgs