From e0d05fd0ccbc4f93abe01276b0ab107eda526788 Mon Sep 17 00:00:00 2001 From: Atsushi Kuwagata Date: Fri, 20 Dec 2024 15:34:40 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crane_plus_moveit_config/CMakeLists.txt | 11 ++++++++--- .../launch/run_move_group.launch.py | 7 ++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/crane_plus_moveit_config/CMakeLists.txt b/crane_plus_moveit_config/CMakeLists.txt index 5d8995a..1227603 100644 --- a/crane_plus_moveit_config/CMakeLists.txt +++ b/crane_plus_moveit_config/CMakeLists.txt @@ -3,9 +3,14 @@ project(crane_plus_moveit_config) find_package(ament_cmake REQUIRED) -ament_package() - install(DIRECTORY launch DESTINATION share/${PROJECT_NAME} PATTERN "setup_assistant.launch" EXCLUDE) install(DIRECTORY config DESTINATION share/${PROJECT_NAME}) -install(FILES .setup_assistant DESTINATION share/${PROJECT_NAME}) \ No newline at end of file +install(FILES .setup_assistant DESTINATION share/${PROJECT_NAME}) + +if(BUILD_TESTING) + find_package(ament_lint_auto REQUIRED) + ament_lint_auto_find_test_dependencies() +endif() + +ament_package() diff --git a/crane_plus_moveit_config/launch/run_move_group.launch.py b/crane_plus_moveit_config/launch/run_move_group.launch.py index 82fb40d..0a8ec0b 100755 --- a/crane_plus_moveit_config/launch/run_move_group.launch.py +++ b/crane_plus_moveit_config/launch/run_move_group.launch.py @@ -13,9 +13,7 @@ # limitations under the License. -# from ament_index_python.packages import get_package_share_directory -from crane_plus_description.robot_description_loader \ - import RobotDescriptionLoader +from crane_plus_description.robot_description_loader import RobotDescriptionLoader from launch import LaunchDescription from launch.actions import DeclareLaunchArgument from launch.substitutions import LaunchConfiguration @@ -23,8 +21,7 @@ from moveit_configs_utils.launches import generate_move_group_launch from moveit_configs_utils.launches import generate_moveit_rviz_launch from moveit_configs_utils.launches import generate_rsp_launch -from moveit_configs_utils.launches \ - import generate_static_virtual_joint_tfs_launch +from moveit_configs_utils.launches import generate_static_virtual_joint_tfs_launch def generate_launch_description():