fix(autoware_auto_tf2): remove duplicated function in tf2_geometry_msg (

#886) chore: add workaround for tf2 update (autowarefoundation#5127) Co-authored-by: Daisuke Nishimatsu <[email protected]> # Conflicts: # planning/behavior_path_planner/CMakeLists.txt
tier4 · Oct 2, 2023 · e856606 · e856606
1 parent de3fd70
commit e856606
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 25 deletions.
diff --git a/common/autoware_auto_geometry/CMakeLists.txt b/common/autoware_auto_geometry/CMakeLists.txt
@@ -12,6 +12,12 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
   src/bounding_box.cpp
 )
 
+if(tf2_geometry_msgs_VERSION VERSION_LESS 0.25.4)
+  target_compile_definitions(${PROJECT_NAME} PRIVATE
+    DEFINE_LEGACY_FUNCTION
+  )
+endif()
+
 if(BUILD_TESTING)
   set(GEOMETRY_GTEST geometry_gtest)
   set(GEOMETRY_SRC test/src/test_geometry.cpp

diff --git a/common/autoware_auto_tf2/CMakeLists.txt b/common/autoware_auto_tf2/CMakeLists.txt
@@ -17,6 +17,11 @@ if(BUILD_TESTING)
     "tf2_geometry_msgs"
     "tf2_ros"
   )
+  if(tf2_geometry_msgs_VERSION VERSION_LESS 0.25.4)
+    target_compile_definitions(test_tf2_autoware_auto_msgs PRIVATE
+      DEFINE_LEGACY_FUNCTION
+    )
+  endif()
 endif()
 
 ament_auto_package()
diff --git a/common/autoware_auto_tf2/include/autoware_auto_tf2/tf2_autoware_auto_msgs.hpp b/common/autoware_auto_tf2/include/autoware_auto_tf2/tf2_autoware_auto_msgs.hpp
@@ -45,7 +45,7 @@ using BoundingBox = autoware_auto_perception_msgs::msg::BoundingBox;
 
 namespace tf2
 {
-
+#ifdef DEFINE_LEGACY_FUNCTION
 /*************/
 /** Point32 **/
 /*************/
@@ -94,6 +94,7 @@ inline void doTransform(
     t_out.points[i].z = static_cast<float>(v_out[2]);
   }
 }
+#endif
 
 /******************/
 /** Quaternion32 **/

diff --git a/planning/behavior_path_planner/CMakeLists.txt b/planning/behavior_path_planner/CMakeLists.txt
@@ -50,31 +50,10 @@ set(common_src
   src/marker_util/lane_change/debug.cpp
 )
 
-if(COMPILE_WITH_OLD_ARCHITECTURE)
-  ament_auto_add_library(behavior_path_planner_node SHARED
-    src/behavior_tree_manager.cpp
-    src/scene_module/scene_module_bt_node_interface.cpp
-    src/scene_module/lane_following/lane_following_module.cpp
-    ${common_src}
+if(tf2_geometry_msgs_VERSION VERSION_LESS 0.25.4)
+  target_compile_definitions(behavior_path_planner_node PRIVATE
+    DEFINE_LEGACY_FUNCTION
   )
-
-  target_compile_definitions(behavior_path_planner_node PRIVATE USE_OLD_ARCHITECTURE)
-
-  message(WARNING "Build behavior_path_planner with OLD framework...")
-
-else()
-  ament_auto_add_library(behavior_path_planner_node SHARED
-    src/planner_manager.cpp
-    src/scene_module/avoidance/manager.cpp
-    src/scene_module/dynamic_avoidance/manager.cpp
-    src/scene_module/start_planner/manager.cpp
-    src/scene_module/goal_planner/manager.cpp
-    src/scene_module/side_shift/manager.cpp
-    src/scene_module/lane_change/manager.cpp
-    ${common_src}
-  )
-
-  message(WARNING "Build behavior_path_planner with NEW framework...")
 endif()
 
 target_include_directories(behavior_path_planner_node SYSTEM PUBLIC

diff --git a/planning/surround_obstacle_checker/CMakeLists.txt b/planning/surround_obstacle_checker/CMakeLists.txt
@@ -18,6 +18,12 @@ ament_auto_add_library(${PROJECT_NAME} SHARED
   src/node.cpp
 )
 
+if(tf2_geometry_msgs_VERSION VERSION_LESS 0.25.4)
+  target_compile_definitions(${PROJECT_NAME} PRIVATE
+    DEFINE_LEGACY_FUNCTION
+  )
+endif()
+
 target_link_libraries(${PROJECT_NAME}
   ${PCL_LIBRARIES}
 )