From f31445b6a2a96870bfb7947ebca97f506f532368 Mon Sep 17 00:00:00 2001 From: Chris Lalancette Date: Tue, 25 Jan 2022 08:19:29 -0500 Subject: [PATCH] Remove unnecessary public definition. (#950) The PLUGINLIB_DISABLE_BOOST define hasn't been honored (or even available) in close to 2 years now, so just remove it from the build. Signed-off-by: Chris Lalancette --- rosbag2_compression/CMakeLists.txt | 3 --- rosbag2_cpp/CMakeLists.txt | 3 --- rosbag2_storage/CMakeLists.txt | 3 --- 3 files changed, 9 deletions(-) diff --git a/rosbag2_compression/CMakeLists.txt b/rosbag2_compression/CMakeLists.txt index 0fdfdbb637..9e48f23972 100644 --- a/rosbag2_compression/CMakeLists.txt +++ b/rosbag2_compression/CMakeLists.txt @@ -45,9 +45,6 @@ ament_target_dependencies(${PROJECT_NAME} rosbag2_storage) target_compile_definitions(${PROJECT_NAME} PRIVATE ROSBAG2_COMPRESSION_BUILDING_DLL) -# prevent pluginlib from using boost -target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") - install( DIRECTORY include/ DESTINATION include) diff --git a/rosbag2_cpp/CMakeLists.txt b/rosbag2_cpp/CMakeLists.txt index 8d66951670..bb09fbe5cf 100644 --- a/rosbag2_cpp/CMakeLists.txt +++ b/rosbag2_cpp/CMakeLists.txt @@ -98,9 +98,6 @@ target_include_directories(${PROJECT_NAME} # which is appropriate when building the dll but not consuming it. target_compile_definitions(${PROJECT_NAME} PRIVATE "ROSBAG2_CPP_BUILDING_DLL") -# prevent pluginlib from using boost -target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") - install( DIRECTORY include/ DESTINATION include) diff --git a/rosbag2_storage/CMakeLists.txt b/rosbag2_storage/CMakeLists.txt index a82426bb6a..d5db545295 100644 --- a/rosbag2_storage/CMakeLists.txt +++ b/rosbag2_storage/CMakeLists.txt @@ -50,9 +50,6 @@ ament_target_dependencies( # which is appropriate when building the dll but not consuming it. target_compile_definitions(${PROJECT_NAME} PRIVATE "ROSBAG2_STORAGE_BUILDING_DLL") -# prevent pluginlib from using boost -target_compile_definitions(${PROJECT_NAME} PUBLIC "PLUGINLIB__DISABLE_BOOST_FUNCTIONS") - install( DIRECTORY include/ DESTINATION include)