Skip to content

Commit

Permalink
modify CMake to apply ci
Browse files Browse the repository at this point in the history
  • Loading branch information
maeshu committed Sep 22, 2019
1 parent 3ba8368 commit d971570
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 19 deletions.
34 changes: 26 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ project(moveit_mpp)

add_compile_options(-std=c++11)

find_package(
catkin
REQUIRED
COMPONENTS

find_package(catkin REQUIRED COMPONENTS
moveit_core
moveit_ros_planning
pluginlib
Expand All @@ -16,10 +14,8 @@ find_package(


catkin_package(
INCLUDE_DIRS
include
LIBRARIES
${PROJECT_NAME}
INCLUDE_DIRS include
LIBRARIES ${PROJECT_NAME}
CATKIN_DEPENDS
moveit_core
moveit_ros_planning
Expand All @@ -35,3 +31,25 @@ include_directories(

add_library(${PROJECT_NAME}_planner_manager src/mpp_planner_manager.cpp)
target_link_libraries(${PROJECT_NAME}_planner_manager ${catkin_LIBRARIES})


#############
## Install ##
#############

install(TARGETS ${PROJECT_NAME}_planner_manager
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

install(DIRECTORY include/
DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
FILES_MATCHING PATTERN "*.h"
)

install(FILES mpp_plugin_description.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})



17 changes: 6 additions & 11 deletions package.xml
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
<?xml version="1.0"?>
<package>
<package format="2">
<name>moveit_mpp</name>
<version>0.1.0</version>
<version>0.0.0</version>
<description>Multi-planner plugin hoster plugin for MoveIt</description>
<author>G.A. vd. Hoorn (TU Delft Robotics Institute)</author>
<maintainer email="[email protected]">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
<license>Apache2</license>

<buildtool_depend>catkin</buildtool_depend>

<build_depend>moveit_core</build_depend>
<build_depend>moveit_ros_planning</build_depend>
<build_depend>pluginlib</build_depend>
<build_depend>roscpp</build_depend>

<run_depend>moveit_core</run_depend>
<run_depend>moveit_ros_planning</run_depend>
<run_depend>pluginlib</run_depend>
<run_depend>roscpp</run_depend>
<depend>moveit_core</depend>
<depend>moveit_ros_planning</depend>
<depend>pluginlib</depend>
<depend>roscpp</depend>

<export>
<moveit_core plugin="${prefix}/mpp_plugin_description.xml"/>
Expand Down

0 comments on commit d971570

Please sign in to comment.