Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use picknik_accessories cmake function #20

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −25
Open

Use picknik_accessories cmake function #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/fanuc_sim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.22)
project(fanuc_sim)

find_package(ament_cmake REQUIRED)
find_package(picknik_accessories REQUIRED)

install_picknik_accessories(
DESTINATION "share/${PROJECT_NAME}/description"
)

install(
DIRECTORY
config
Expand Down
1 change: 1 addition & 0 deletions src/fanuc_sim/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<depend>picknik_accessories</depend>
<exec_depend>admittance_controller</exec_depend>
<exec_depend>kinematics_interface_kdl</exec_depend>
<exec_depend>moveit_planners_stomp</exec_depend>
Expand Down
25 changes: 2 additions & 23 deletions src/lab_sim/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,9 @@ project(lab_sim)
find_package(ament_cmake REQUIRED)
find_package(picknik_accessories REQUIRED)


# Install all XML files in directory
set(PICKNIK_ACCESSORIES_SHARE_DIR
"${CMAKE_INSTALL_PREFIX}/../picknik_accessories/share/picknik_accessories/mujoco_assets/"
install_picknik_accessories(
DESTINATION "share/${PROJECT_NAME}/description"
)
# Destination directory
set(DEST_DIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/description/")

install(DIRECTORY "${PICKNIK_ACCESSORIES_SHARE_DIR}"
DESTINATION "${DEST_DIR}"
FILES_MATCHING PATTERN "*")

# Install individual XML files
# set(EXTERNAL_XML_FILES
# "${PICKNIK_ACCESSORIES_SHARE_DIR}/ur5e/ur5e_globals.xml"
# "${PICKNIK_ACCESSORIES_SHARE_DIR}/ur5e/ur5e.xml"
# # Add additional files here if desired
# )
# foreach(xml_file IN LISTS EXTERNAL_XML_FILES)
# install(FILES "${xml_file}"
# DESTINATION "${DEST_DIR}"
# )
# endforeach()

install(
DIRECTORY
config
Expand Down
2 changes: 1 addition & 1 deletion src/lab_sim/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<depend>picknik_accessories</depend>
<exec_depend>admittance_controller</exec_depend>
<exec_depend>moveit_planners_stomp</exec_depend>
<exec_depend>moveit_ros_perception</exec_depend>
<exec_depend>moveit_studio_agent</exec_depend>
<exec_depend>moveit_studio_behavior</exec_depend>
<exec_depend>moveit_studio_ur_pstop_manager</exec_depend>
<exec_depend>picknik_accessories</exec_depend>
<exec_depend>realsense2_camera</exec_depend>
<exec_depend>realsense2_description</exec_depend>
<exec_depend>robotiq_description</exec_depend>
Expand Down
2 changes: 1 addition & 1 deletion src/picknik_accessories
Open in desktop
Submodule picknik_accessories updated 4 files
+14 −0 CMakeLists.txt
+24 −0 cmake/Modules/InstallPicknikAccessories.cmake
+8 −0 cmake/picknik_accessoriesConfig.cmake
+0 −3 mujoco_assets/assets/Cube copy.stl
Loading