Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
iri_tiago_play_motion_module
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
labrobotica
ros
platforms
TIAGo
iri_tiago_play_motion_module
Commits
843b3478
Commit
843b3478
authored
6 years ago
by
Irene Garcia Camacho
Browse files
Options
Downloads
Patches
Plain Diff
Implemented the new constraints
parent
5f20e8bd
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+3
-3
3 additions, 3 deletions
CMakeLists.txt
package.xml
+2
-0
2 additions, 0 deletions
package.xml
with
5 additions
and
3 deletions
CMakeLists.txt
+
3
−
3
View file @
843b3478
...
...
@@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 2.8.3)
project
(
tiago_modules
)
## Add support for C++11, supported in ROS Kinetic and newer
#
add_definitions(-std=c++11)
add_definitions
(
-std=c++11
)
## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package
(
catkin REQUIRED COMPONENTS roscpp dynamic_reconfigure iri_ros_tools actionlib play_motion_msgs control_msgs geometry_msgs std_srvs move_base_msgs tf nav_msgs pal_navigation_msgs pal_interaction_msgs pal_waypoint_msgs
)
find_package
(
catkin REQUIRED COMPONENTS roscpp dynamic_reconfigure iri_ros_tools actionlib play_motion_msgs control_msgs geometry_msgs std_srvs move_base_msgs tf nav_msgs pal_navigation_msgs pal_interaction_msgs pal_waypoint_msgs
moveit_ros_planning_interface
)
## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)
...
...
@@ -108,7 +108,7 @@ generate_dynamic_reconfigure_options(
catkin_package
(
INCLUDE_DIRS include
LIBRARIES gripper_module play_motion_module head_module torso_module nav_module tts_module arm_module move_platform_module
CATKIN_DEPENDS roscpp dynamic_reconfigure iri_ros_tools actionlib play_motion_msgs control_msgs geometry_msgs std_srvs move_base_msgs tf nav_msgs pal_navigation_msgs pal_waypoint_msgs pal_interaction_msgs
CATKIN_DEPENDS roscpp dynamic_reconfigure iri_ros_tools actionlib play_motion_msgs control_msgs geometry_msgs std_srvs move_base_msgs tf nav_msgs pal_navigation_msgs pal_waypoint_msgs pal_interaction_msgs
moveit_ros_planning_interface
# DEPENDS system_lib
)
...
...
This diff is collapsed.
Click to expand it.
package.xml
+
2
−
0
View file @
843b3478
...
...
@@ -54,6 +54,7 @@
<build_depend>
pal_waypoint_msgs
</build_depend>
<build_depend>
pal_interaction_msgs
</build_depend>
<build_depend>
tf
</build_depend>
<build_depend>
moveit_ros_planning_interface
</build_depend>
<!-- new dependencies -->
<!--<build_depend>new build dependency</build_depend>-->
<run_depend>
iri_ros_tools
</run_depend>
...
...
@@ -70,6 +71,7 @@
<run_depend>
pal_waypoint_msgs
</run_depend>
<run_depend>
pal_interaction_msgs
</run_depend>
<run_depend>
tf
</run_depend>
<run_depend>
moveit_ros_planning_interface
</run_depend>
<!-- new dependencies -->
<!--<run_depend>new run dependency</run_depend>-->
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment