From dff79597a7381b2d4f5ba663c409e0e24ed24518 Mon Sep 17 00:00:00 2001 From: Andrea Ponza Date: Fri, 11 Oct 2019 15:56:37 +0200 Subject: [PATCH] fix catkin lint issues --- CMakeLists.txt | 86 +++++++++++++++++++++++++++++++++++++++++--------- package.xml | 85 +++++++++++-------------------------------------- 2 files changed, 89 insertions(+), 82 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3bc883e..d54477e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,24 @@ cmake_minimum_required(VERSION 2.8.3) project(gpd_ros) +add_compile_options(-std=c++14) + ## 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 cmake_modules eigen_conversions message_generation roscpp rospy sensor_msgs std_msgs) +## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) is used, also find other catkin packages +find_package(catkin REQUIRED COMPONENTS + cmake_modules + eigen_conversions + geometry_msgs + message_generation + pcl_conversions + roscpp + sensor_msgs + std_msgs + visualization_msgs +) # PCL find_package(PCL REQUIRED) -include_directories(${PCL_INCLUDE_DIRS}) -link_directories(${PCL_LIBRARY_DIRS}) -add_definitions(${PCL_DEFINITIONS}) ## System dependencies are found with CMake's conventions find_library(GPD_LIB NAMES gpd PATHS /usr/local/lib PATH_SUFFIXES lib NO_DEFAULT_PATH) @@ -22,11 +30,15 @@ endif() include_directories(${GPD_LIB_INCLUDE_DIR}) message(STATUS "gpd_include_dir: ${GPD_LIB_INCLUDE_DIR}") -set(CMAKE_CXX_FLAGS "-O3 -fopenmp -fPIC -Wno-deprecated -Wenum-compare -Wno-ignored-attributes -std=c++14") - ## Generate messages in the 'msg' folder -add_message_files(FILES CloudIndexed.msg CloudSamples.msg CloudSources.msg GraspConfig.msg GraspConfigList.msg - SamplesMsg.msg) +add_message_files(FILES + CloudIndexed.msg + CloudSamples.msg + CloudSources.msg + GraspConfig.msg + GraspConfigList.msg + SamplesMsg.msg +) ## Generate services in the 'srv' folder add_service_files(FILES detect_grasps.srv) @@ -44,11 +56,22 @@ generate_messages(DEPENDENCIES geometry_msgs sensor_msgs std_msgs) ## CATKIN_DEPENDS: catkin_packages dependent projects also need ## DEPENDS: system dependencies of this project that dependent projects also need catkin_package( -INCLUDE_DIRS include -CATKIN_DEPENDS cmake_modules eigen_conversions geometry_msgs message_runtime roscpp sensor_msgs std_msgs -DEPENDS PCL -# CATKIN_DEPENDS cmake_modules eigen_conversions geometry_msgs message_runtime roscpp sensor_msgs std_msgs -# DEPENDS Eigen OpenCV PCL + INCLUDE_DIRS include + LIBRARIES + ${PROJECT_NAME}_grasp_messages + ${PROJECT_NAME}_grasp_plotter + CATKIN_DEPENDS + cmake_modules + eigen_conversions + geometry_msgs + message_generation + message_runtime + pcl_conversions + roscpp + sensor_msgs + std_msgs + visualization_msgs + DEPENDS PCL ) ########### @@ -91,3 +114,36 @@ target_link_libraries(${PROJECT_NAME}_grasp_plotter target_link_libraries(${PROJECT_NAME}_grasp_messages ${GPD_LIB} ${catkin_LIBRARIES}) + + +############# +## Install ## +############# + +# all install targets should use catkin DESTINATION variables +# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html + +## Mark executables and/or libraries for installation +install(TARGETS + ${PROJECT_NAME}_detect_grasps + ${PROJECT_NAME}_detect_grasps_server + ${PROJECT_NAME}_grasp_messages + ${PROJECT_NAME}_grasp_plotter + + ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} + RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} +) + +## Mark cpp header files for installation +install(DIRECTORY include/${PROJECT_NAME}/ + DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} + FILES_MATCHING PATTERN "*.h" + PATTERN "*.git" EXCLUDE +) + +## Mark other files for installation (e.g. launch and bag files, etc.) +install(DIRECTORY launch/ + DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch + PATTERN ".git" EXCLUDE +) diff --git a/package.xml b/package.xml index 42f6f0c..5062a83 100644 --- a/package.xml +++ b/package.xml @@ -1,80 +1,31 @@ - + + gpd_ros 0.0.0 - The gpd_ros package + + wrapper around the GPD package for detecting 6-DOF grasp poses for a + 2-finger robot hand (e.g. a parallel jaw gripper) in 3D point clouds. + - - - ur5 + BSD - - - - TODO - - - - - - + catkin + cmake_modules + eigen_conversions + geometry_msgs + pcl_conversions + roscpp + sensor_msgs + std_msgs + visualization_msgs - - - - + message_generation + message_generation - - - - - - - - - - - - - - - - - - - - - catkin - - cmake_modules - eigen_conversions - geometry_msgs - message_generation - roscpp - rospy - sensor_msgs - std_msgs - - roscpp - rospy - - cmake_modules - eigen_conversions - geometry_msgs message_runtime - roscpp - rospy - sensor_msgs - std_msgs - - - - - - -