Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
panda_grasping
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
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
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
CeTI
ROS
ROS Packages
panda_grasping
Commits
65d0fd33
Commit
65d0fd33
authored
4 years ago
by
Johannes Mey
Browse files
Options
Downloads
Patches
Plain Diff
move header files, cleanup CMakeLists a bit
parent
56bafa5e
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CMakeLists.txt
+13
-5
13 additions, 5 deletions
CMakeLists.txt
include/environment_util.h
+0
-0
0 additions, 0 deletions
include/environment_util.h
include/franka_gripper_util.h
+0
-0
0 additions, 0 deletions
include/franka_gripper_util.h
include/grasp_util.h
+0
-0
0 additions, 0 deletions
include/grasp_util.h
with
13 additions
and
5 deletions
CMakeLists.txt
+
13
−
5
View file @
65d0fd33
...
@@ -15,7 +15,8 @@ find_package(catkin REQUIRED
...
@@ -15,7 +15,8 @@ find_package(catkin REQUIRED
moveit_core
moveit_core
moveit_ros_planning_interface
moveit_ros_planning_interface
franka_gripper
franka_gripper
message_generation
)
message_generation
)
## Generate services in the 'srv' folder
## Generate services in the 'srv' folder
add_service_files
(
add_service_files
(
...
@@ -40,6 +41,8 @@ catkin_package(CATKIN_DEPENDS
...
@@ -40,6 +41,8 @@ catkin_package(CATKIN_DEPENDS
moveit_visual_tools
moveit_visual_tools
moveit_ros_planning_interface
moveit_ros_planning_interface
pluginlib
pluginlib
INCLUDE_DIRS include
LIBRARIES EnvironmentUtil GraspUtil FrankaGripperUtil
)
)
# ################################################################################################################################
# ################################################################################################################################
...
@@ -47,11 +50,16 @@ catkin_package(CATKIN_DEPENDS
...
@@ -47,11 +50,16 @@ catkin_package(CATKIN_DEPENDS
# ################################################################################################################################
# ################################################################################################################################
# Specify additional locations of header files Your package locations should be listed before other locations
# Specify additional locations of header files Your package locations should be listed before other locations
include_directories
(
${
catkin_INCLUDE_DIRS
}
)
## Specify additional locations of header files
## Your package locations should be listed before other locations
include_directories
(
include
${
catkin_INCLUDE_DIRS
}
)
add_library
(
EnvironmentUtil src/grasping/environment_util.cpp
src/grasping/environment_util.h
)
add_library
(
EnvironmentUtil src/grasping/environment_util.cpp
)
add_library
(
GraspUtil src/grasping/grasp_util.cpp
src/grasping/grasp_util.h
)
add_library
(
GraspUtil src/grasping/grasp_util.cpp
)
add_library
(
FrankaGripperUtil src/grasping/franka_gripper_util.cpp
src/grasping/franka_gripper_util.h
)
add_library
(
FrankaGripperUtil src/grasping/franka_gripper_util.cpp
)
add_executable
(
grasp_service src/grasping/grasp_service.cpp
)
add_executable
(
grasp_service src/grasping/grasp_service.cpp
)
...
...
This diff is collapsed.
Click to expand it.
src/grasping
/environment_util.h
→
include
/environment_util.h
+
0
−
0
View file @
65d0fd33
File moved
This diff is collapsed.
Click to expand it.
src/grasping
/franka_gripper_util.h
→
include
/franka_gripper_util.h
+
0
−
0
View file @
65d0fd33
File moved
This diff is collapsed.
Click to expand it.
src/grasping
/grasp_util.h
→
include
/grasp_util.h
+
0
−
0
View file @
65d0fd33
File moved
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