Merge remote-tracking branch 'origin/pr-rolling_galactic' into pr-rol…

…ling_galactic
moveit · Jun 15, 2021 · 75dff2a · 75dff2a
2 parents 645bea1 + 4a532b3
commit 75dff2a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/moveit_ros/planning/trajectory_execution_manager/CMakeLists.txt b/moveit_ros/planning/trajectory_execution_manager/CMakeLists.txt
@@ -1,6 +1,6 @@
 set(MOVEIT_LIB_NAME moveit_trajectory_execution_manager)
 
-find_package(tinyxml_vendor)
+find_package(tinyxml_vendor REQUIRED)
 
 add_library(${MOVEIT_LIB_NAME} SHARED src/trajectory_execution_manager.cpp)
 set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")

diff --git a/moveit_ros/planning_interface/moveit_cpp/src/moveit_cpp.cpp b/moveit_ros/planning_interface/moveit_cpp/src/moveit_cpp.cpp
@@ -39,7 +39,7 @@
 #include <moveit/planning_scene_monitor/current_state_monitor.h>
 #include <moveit/common_planning_interface_objects/common_objects.h>
 #include <tf2_geometry_msgs/tf2_geometry_msgs.h>
-#include <geometry_msgs/msg/quaternion_stamped.h>
+#include <geometry_msgs/msg/quaternion_stamped.hpp>
 #include <tf2/utils.h>
 #include <tf2_ros/transform_listener.h>
 #include <rclcpp/rclcpp.hpp>