Skip to content
Snippets Groups Projects
Commit 65d0fd33 authored by Johannes Mey's avatar Johannes Mey
Browse files

move header files, cleanup CMakeLists a bit

parent 56bafa5e
No related branches found
No related tags found
No related merge requests found
...@@ -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)
......
File moved
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment