Skip to content

Commit

Permalink
Fixes compilation up to moveit_ros
Browse files Browse the repository at this point in the history
  • Loading branch information
TSNoble committed Nov 17, 2024
1 parent f64a9fa commit 603ba86
Show file tree
Hide file tree
Showing 15 changed files with 25 additions and 25 deletions.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
set(HEADERS
include/moveit/motion_planning_rviz_plugin/motion_planning_display.h
include/moveit/motion_planning_rviz_plugin/motion_planning_frame.h
include/moveit/motion_planning_rviz_plugin/motion_planning_frame_joints_widget.h
include/moveit/motion_planning_rviz_plugin/motion_planning_param_widget.h
include/moveit/motion_planning_rviz_plugin/interactive_marker_display.h)
include/moveit/motion_planning_rviz_plugin/motion_planning_display.hpp
include/moveit/motion_planning_rviz_plugin/motion_planning_frame.hpp
include/moveit/motion_planning_rviz_plugin/motion_planning_frame_joints_widget.hpp
include/moveit/motion_planning_rviz_plugin/motion_planning_param_widget.hpp
include/moveit/motion_planning_rviz_plugin/interactive_marker_display.hpp)
qt5_wrap_ui(UIC_FILES src/ui/motion_planning_rviz_plugin_frame.ui
src/ui/motion_planning_rviz_plugin_frame_joints.ui)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@

#include <QShortcut>

#include "ui_motion_planning_rviz_plugin_frame.hpp"
#include "ui_motion_planning_rviz_plugin_frame.h"
#include <moveit/utils/rclcpp_utils.hpp>
#include <moveit/utils/logger.hpp>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
#include <QComboBox>
#include <QShortcut>

#include "ui_motion_planning_rviz_plugin_frame.hpp"
#include "ui_motion_planning_rviz_plugin_frame.h"

namespace moveit_rviz_plugin
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#include <QMessageBox>
#include <QInputDialog>

#include "ui_motion_planning_rviz_plugin_frame.hpp"
#include "ui_motion_planning_rviz_plugin_frame.h"

namespace moveit_rviz_plugin
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include <moveit/motion_planning_rviz_plugin/motion_planning_frame_joints_widget.hpp>
#include <moveit/motion_planning_rviz_plugin/motion_planning_display.hpp>

#include "ui_motion_planning_rviz_plugin_frame_joints.hpp"
#include "ui_motion_planning_rviz_plugin_frame_joints.h"
#include <QPainter>
#include <QSlider>
#include <QEvent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

#include <tf2_eigen/tf2_eigen.hpp>

#include "ui_motion_planning_rviz_plugin_frame.hpp"
#include "ui_motion_planning_rviz_plugin_frame.h"

namespace moveit_rviz_plugin
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
#include <QInputDialog>
#include <QFileDialog>

#include "ui_motion_planning_rviz_plugin_frame.hpp"
#include "ui_motion_planning_rviz_plugin_frame.h"

namespace
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#include <tf2_eigen/tf2_eigen.hpp>
#include <moveit/trajectory_processing/time_optimal_trajectory_generation.hpp>

#include "ui_motion_planning_rviz_plugin_frame.hpp"
#include "ui_motion_planning_rviz_plugin_frame.h"

namespace moveit_rviz_plugin
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
#include <QMessageBox>
#include <QInputDialog>

#include "ui_motion_planning_rviz_plugin_frame.hpp"
#include "ui_motion_planning_rviz_plugin_frame.h"

#include <memory>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include <QMessageBox>
#include <QInputDialog>

#include "ui_motion_planning_rviz_plugin_frame.hpp"
#include "ui_motion_planning_rviz_plugin_frame.h"

namespace moveit_rviz_plugin
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2080,7 +2080,7 @@ This is usually achieved by random seeding, which can flip the robot configurati
<customwidget>
<class>moveit_rviz_plugin::MotionPlanningParamWidget</class>
<extends>QTreeView</extends>
<header location="global">moveit/motion_planning_rviz_plugin/motion_planning_param_widget.h</header>
<header location="global">moveit/motion_planning_rviz_plugin/motion_planning_param_widget.hpp</header>
</customwidget>
</customwidgets>
<tabstops>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
add_library(
moveit_planning_scene_rviz_plugin_core SHARED
src/planning_scene_display.cpp src/background_processing.cpp
include/moveit/planning_scene_rviz_plugin/planning_scene_display.h)
include/moveit/planning_scene_rviz_plugin/planning_scene_display.hpp)
include(GenerateExportHeader)
generate_export_header(moveit_planning_scene_rviz_plugin_core)
target_include_directories(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
add_library(
moveit_robot_state_rviz_plugin_core SHARED
src/robot_state_display.cpp
include/moveit/robot_state_rviz_plugin/robot_state_display.h)
include/moveit/robot_state_rviz_plugin/robot_state_display.hpp)
set_target_properties(moveit_robot_state_rviz_plugin_core
PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
target_link_libraries(moveit_robot_state_rviz_plugin_core
Expand Down
14 changes: 7 additions & 7 deletions moveit_ros/visualization/rviz_plugin_render_tools/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
set(HEADERS
include/moveit/rviz_plugin_render_tools/octomap_render.h
include/moveit/rviz_plugin_render_tools/planning_link_updater.h
include/moveit/rviz_plugin_render_tools/planning_scene_render.h
include/moveit/rviz_plugin_render_tools/render_shapes.h
include/moveit/rviz_plugin_render_tools/robot_state_visualization.h
include/moveit/rviz_plugin_render_tools/trajectory_visualization.h
include/moveit/rviz_plugin_render_tools/trajectory_panel.h
include/moveit/rviz_plugin_render_tools/octomap_render.hpp
include/moveit/rviz_plugin_render_tools/planning_link_updater.hpp
include/moveit/rviz_plugin_render_tools/planning_scene_render.hpp
include/moveit/rviz_plugin_render_tools/render_shapes.hpp
include/moveit/rviz_plugin_render_tools/robot_state_visualization.hpp
include/moveit/rviz_plugin_render_tools/trajectory_visualization.hpp
include/moveit/rviz_plugin_render_tools/trajectory_panel.hpp
include/ogre_helpers/mesh_shape.hpp)

include_directories(${CMAKE_CURRENT_BINARY_DIR})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Header files that need Qt Moc pre-processing for use with Qt signals, etc:
set(HEADERS include/moveit/trajectory_rviz_plugin/trajectory_display.h)
set(HEADERS include/moveit/trajectory_rviz_plugin/trajectory_display.hpp)

include_directories(${CMAKE_CURRENT_BINARY_DIR})

Expand Down

0 comments on commit 603ba86

Please sign in to comment.