Skip to content

Commit

Permalink
Update ros-noetic-moveit-ros-planning.win.patch
Browse files Browse the repository at this point in the history
Remove changes upstreamed in moveit/moveit#2772
  • Loading branch information
traversaro authored Oct 14, 2023
1 parent e6eea21 commit df81ecd
Showing 1 changed file with 0 additions and 27 deletions.
27 changes: 0 additions & 27 deletions patch/ros-noetic-moveit-ros-planning.win.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,6 @@ index 897af9fc8..6675d1bc6 100644
+ RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+ )

diff --git a/plan_execution/CMakeLists.txt b/plan_execution/CMakeLists.txt
index 6b579cfb1..b95b4c657 100644
--- a/plan_execution/CMakeLists.txt
+++ b/plan_execution/CMakeLists.txt
@@ -3,6 +3,8 @@ set(MOVEIT_LIB_NAME moveit_plan_execution)
add_library(${MOVEIT_LIB_NAME}
src/plan_with_sensing.cpp
src/plan_execution.cpp)
+add_dependencies(${MOVEIT_LIB_NAME} ${moveit_ros_planning_EXPORTED_TARGETS})
+
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
target_link_libraries(${MOVEIT_LIB_NAME}
moveit_planning_pipeline
diff --git a/planning_scene_monitor/CMakeLists.txt b/planning_scene_monitor/CMakeLists.txt
index 6329feef3..b049e2b36 100644
--- a/planning_scene_monitor/CMakeLists.txt
+++ b/planning_scene_monitor/CMakeLists.txt
@@ -4,6 +4,8 @@ add_library(${MOVEIT_LIB_NAME}
src/planning_scene_monitor.cpp
src/current_state_monitor.cpp
src/trajectory_monitor.cpp)
+add_dependencies(${MOVEIT_LIB_NAME} ${moveit_ros_planning_EXPORTED_TARGETS})
+
set_target_properties(${MOVEIT_LIB_NAME} PROPERTIES VERSION "${${PROJECT_NAME}_VERSION}")
target_link_libraries(${MOVEIT_LIB_NAME}
moveit_robot_model_loader

diff --git a/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.h b/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.h
index e7514f670..530b3929a 100644
--- a/planning_pipeline/include/moveit/planning_pipeline/planning_pipeline.h
Expand Down

0 comments on commit df81ecd

Please sign in to comment.