From 13e50b421cc138c8e98b07664af2c8628ad3a021 Mon Sep 17 00:00:00 2001 From: Joe Schornak Date: Tue, 9 Nov 2021 13:02:47 -0500 Subject: [PATCH 1/3] fix installed path of control interface header files --- moveit_plugins/moveit_ros_control_interface/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt b/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt index dd2b7e07e3..4e6f66ea69 100644 --- a/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt +++ b/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt @@ -76,10 +76,11 @@ EXPORT export_${PROJECT_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib RUNTIME DESTINATION bin +INCLUDES DESTINATION include ) ## Mark cpp header files for installation -install(DIRECTORY include/${PROJECT_NAME}/ +install(DIRECTORY include/ DESTINATION include ) From fd22eab1ca4b41da480553c1079534afdd1c3475 Mon Sep 17 00:00:00 2001 From: Joe Schornak Date: Wed, 10 Nov 2021 16:37:20 -0500 Subject: [PATCH 2/3] delete duplicated header installation --- moveit_plugins/moveit_ros_control_interface/CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt b/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt index 4e6f66ea69..4805d82dcb 100644 --- a/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt +++ b/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt @@ -79,11 +79,6 @@ RUNTIME DESTINATION bin INCLUDES DESTINATION include ) -## Mark cpp header files for installation -install(DIRECTORY include/ - DESTINATION include -) - pluginlib_export_plugin_description_file(moveit_core moveit_core_plugins.xml) pluginlib_export_plugin_description_file(moveit_ros_control_interface moveit_ros_control_interface_plugins.xml) From 672a4adb027385b93c65ff30fe85235f9e908eb0 Mon Sep 17 00:00:00 2001 From: Joe Schornak Date: Thu, 11 Nov 2021 10:15:32 -0500 Subject: [PATCH 3/3] Revert "delete duplicated header installation" This reverts commit fd22eab1ca4b41da480553c1079534afdd1c3475. --- moveit_plugins/moveit_ros_control_interface/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt b/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt index 4805d82dcb..4e6f66ea69 100644 --- a/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt +++ b/moveit_plugins/moveit_ros_control_interface/CMakeLists.txt @@ -79,6 +79,11 @@ RUNTIME DESTINATION bin INCLUDES DESTINATION include ) +## Mark cpp header files for installation +install(DIRECTORY include/ + DESTINATION include +) + pluginlib_export_plugin_description_file(moveit_core moveit_core_plugins.xml) pluginlib_export_plugin_description_file(moveit_ros_control_interface moveit_ros_control_interface_plugins.xml)