Skip to content

Commit

Permalink
convert depend in build_export_depend as pluginlib is header only
Browse files Browse the repository at this point in the history
actually keep them as build_depend and build_export_depend as they are "find_package(REQUIRED) in the CMakeLists of this package"

remove libboost-system as it doesnt seem to be imported/used anywhere
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
  • Loading branch information
mikaelarguedas committed Feb 7, 2020
1 parent 6beeab2 commit 4dccaf1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pluginlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3)
project(pluginlib)

find_package(catkin REQUIRED COMPONENTS class_loader rosconsole roslib cmake_modules)
find_package(Boost REQUIRED COMPONENTS filesystem system)
find_package(Boost REQUIRED COMPONENTS filesystem)
find_package(TinyXML2 REQUIRED)

catkin_package(
Expand Down
16 changes: 10 additions & 6 deletions pluginlib/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,17 @@
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>

<build_depend>cmake_modules</build_depend>
<build_depend>libboost-filesystem-dev</build_depend>
<build_depend>class_loader</build_depend>
<build_depend>rosconsole</build_depend>
<build_depend version_gte="1.11.1">roslib</build_depend>
<build_depend>tinyxml2</build_depend>

<depend>libboost-filesystem-dev</depend>
<depend>libboost-system-dev</depend>
<depend>class_loader</depend>
<depend>rosconsole</depend>
<depend version_gte="1.11.1">roslib</depend>
<depend>tinyxml2</depend>
<build_export_depend>libboost-filesystem-dev</build_export_depend>
<build_export_depend>class_loader</build_export_depend>
<build_export_depend>rosconsole</build_export_depend>
<build_export_depend version_gte="1.11.1">roslib</build_export_depend>
<build_export_depend>tinyxml2</build_export_depend>

<export>
<pluginlib plugin="${prefix}/test/test_plugins.xml"/>
Expand Down

0 comments on commit 4dccaf1

Please sign in to comment.