Skip to content

Commit 29c1af0

Browse files
devritedevrite
authored
Remove deprecated pluginlib boost feature disable (ros-navigation#2431)
Boost features have been deprecated and removed in pluginlib for rolling
1 parent 7fa5509 commit 29c1af0

File tree

12 files changed

+0
-57
lines changed

12 files changed

+0
-57
lines changed

‎nav2_controller/CMakeLists.txt

-11
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ add_library(${library_name}
3232
src/nav2_controller.cpp
3333
)
3434

35-
target_compile_definitions(${library_name} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
36-
3735
set(dependencies
3836
angles
3937
rclcpp
@@ -49,27 +47,18 @@ set(dependencies
4947

5048
add_library(simple_progress_checker SHARED plugins/simple_progress_checker.cpp)
5149
ament_target_dependencies(simple_progress_checker ${dependencies})
52-
# prevent pluginlib from using boost
53-
target_compile_definitions(simple_progress_checker PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
5450

5551
add_library(simple_goal_checker SHARED plugins/simple_goal_checker.cpp)
5652
ament_target_dependencies(simple_goal_checker ${dependencies})
57-
# prevent pluginlib from using boost
58-
target_compile_definitions(simple_goal_checker PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
5953

6054
add_library(stopped_goal_checker SHARED plugins/stopped_goal_checker.cpp)
6155
target_link_libraries(stopped_goal_checker simple_goal_checker)
6256
ament_target_dependencies(stopped_goal_checker ${dependencies})
63-
# prevent pluginlib from using boost
64-
target_compile_definitions(stopped_goal_checker PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
6557

6658
ament_target_dependencies(${library_name}
6759
${dependencies}
6860
)
6961

70-
# prevent pluginlib from using boost
71-
target_compile_definitions(${library_name} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
72-
7362
if(BUILD_TESTING)
7463
find_package(ament_lint_auto REQUIRED)
7564
# the following line skips the linter which checks for copyrights

‎nav2_costmap_2d/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ add_library(nav2_costmap_2d_core SHARED
5252
plugins/costmap_filters/costmap_filter.cpp
5353
)
5454

55-
# prevent pluginlib from using boost
56-
target_compile_definitions(nav2_costmap_2d_core PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
57-
5855
set(dependencies
5956
geometry_msgs
6057
laser_geometry

‎nav2_dwb_controller/dwb_core/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ add_library(dwb_core SHARED
4848
src/trajectory_utils.cpp
4949
)
5050

51-
# prevent pluginlib from using boost
52-
target_compile_definitions(dwb_core PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
53-
5451
ament_target_dependencies(dwb_core
5552
${dependencies}
5653
)

‎nav2_dwb_controller/dwb_critics/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ add_library(${PROJECT_NAME} SHARED
3636
src/twirling.cpp
3737
)
3838

39-
# prevent pluginlib from using boost
40-
target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
41-
4239
set(dependencies
4340
angles
4441
nav2_costmap_2d

‎nav2_dwb_controller/dwb_plugins/CMakeLists.txt

-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ add_library(standard_traj_generator SHARED
3333
src/kinematic_parameters.cpp
3434
src/xy_theta_iterator.cpp)
3535
ament_target_dependencies(standard_traj_generator ${dependencies})
36-
# prevent pluginlib from using boost
37-
target_compile_definitions(standard_traj_generator PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
3836

3937

4038
if(BUILD_TESTING)

‎nav2_navfn_planner/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ ament_target_dependencies(${library_name}
5252
${dependencies}
5353
)
5454

55-
# prevent pluginlib from using boost
56-
target_compile_definitions(${library_name} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
57-
5855
pluginlib_export_plugin_description_file(nav2_core global_planner_plugin.xml)
5956

6057
install(TARGETS ${library_name}

‎nav2_planner/CMakeLists.txt

-5
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ ament_target_dependencies(${library_name}
5252
${dependencies}
5353
)
5454

55-
target_compile_definitions(${library_name} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
56-
5755
add_executable(${executable_name}
5856
src/main.cpp
5957
)
@@ -64,9 +62,6 @@ ament_target_dependencies(${executable_name}
6462
${dependencies}
6563
)
6664

67-
# prevent pluginlib from using boost
68-
target_compile_definitions(${library_name} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
69-
7065
install(TARGETS ${library_name}
7166
ARCHIVE DESTINATION lib
7267
LIBRARY DESTINATION lib

‎nav2_recoveries/CMakeLists.txt

-12
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ ament_target_dependencies(nav2_spin_recovery
5353
${dependencies}
5454
)
5555

56-
# prevent pluginlib from using boost
57-
target_compile_definitions(nav2_spin_recovery PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
58-
5956
add_library(nav2_backup_recovery SHARED
6057
plugins/back_up.cpp
6158
)
@@ -64,9 +61,6 @@ ament_target_dependencies(nav2_backup_recovery
6461
${dependencies}
6562
)
6663

67-
# prevent pluginlib from using boost
68-
target_compile_definitions(nav2_backup_recovery PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
69-
7064
add_library(nav2_wait_recovery SHARED
7165
plugins/wait.cpp
7266
)
@@ -75,9 +69,6 @@ ament_target_dependencies(nav2_wait_recovery
7569
${dependencies}
7670
)
7771

78-
# prevent pluginlib from using boost
79-
target_compile_definitions(nav2_wait_recovery PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
80-
8172
pluginlib_export_plugin_description_file(nav2_core recovery_plugin.xml)
8273

8374
# Library
@@ -89,9 +80,6 @@ ament_target_dependencies(${library_name}
8980
${dependencies}
9081
)
9182

92-
# prevent pluginlib from using boost
93-
target_compile_definitions(${library_name} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
94-
9583
# Executable
9684
add_executable(${executable_name}
9785
src/main.cpp

‎nav2_regulated_pure_pursuit_controller/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ set(library_name nav2_regulated_pure_pursuit_controller)
3535
add_library(${library_name} SHARED
3636
src/regulated_pure_pursuit_controller.cpp)
3737

38-
# prevent pluginlib from using boost
39-
target_compile_definitions(${library_name} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
40-
4138
ament_target_dependencies(${library_name}
4239
${dependencies}
4340
)

‎nav2_rviz_plugins/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ target_link_libraries(${library_name}
9191
# TODO: Make this specific to this project (not rviz default plugins)
9292
target_compile_definitions(${library_name} PRIVATE "RVIZ_DEFAULT_PLUGINS_BUILDING_LIBRARY")
9393

94-
# prevent pluginlib from using boost
95-
target_compile_definitions(${library_name} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
96-
9794
pluginlib_export_plugin_description_file(rviz_common plugins_description.xml)
9895

9996
install(

‎nav2_smac_planner/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,6 @@ ament_target_dependencies(${library_name}_2d
9797
${dependencies}
9898
)
9999

100-
target_compile_definitions(${library_name} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
101-
target_compile_definitions(${library_name}_2d PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
102-
103100
pluginlib_export_plugin_description_file(nav2_core smac_plugin.xml)
104101
pluginlib_export_plugin_description_file(nav2_core smac_plugin_2d.xml)
105102

‎nav2_waypoint_follower/CMakeLists.txt

-6
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,12 @@ ament_target_dependencies(${library_name}
6969

7070
add_library(wait_at_waypoint SHARED plugins/wait_at_waypoint.cpp)
7171
ament_target_dependencies(wait_at_waypoint ${dependencies})
72-
#prevent pluginlib from using boost
73-
target_compile_definitions(wait_at_waypoint PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
7472

7573
add_library(photo_at_waypoint SHARED plugins/photo_at_waypoint.cpp)
7674
ament_target_dependencies(photo_at_waypoint ${dependencies})
77-
#prevent pluginlib from using boost
78-
target_compile_definitions(photo_at_waypoint PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
7975

8076
add_library(input_at_waypoint SHARED plugins/input_at_waypoint.cpp)
8177
ament_target_dependencies(input_at_waypoint ${dependencies})
82-
#prevent pluginlib from using boost
83-
target_compile_definitions(input_at_waypoint PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS")
8478

8579
install(TARGETS ${library_name} wait_at_waypoint photo_at_waypoint input_at_waypoint
8680
ARCHIVE DESTINATION lib

0 commit comments

Comments
 (0)