Skip to content

Commit 191e11b

Browse files
committed
switching to new cmake function
1 parent 632bc53 commit 191e11b

File tree

5 files changed

+10
-25
lines changed

5 files changed

+10
-25
lines changed

src/fanuc_sim/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.22)
22
project(fanuc_sim)
33

44
find_package(ament_cmake REQUIRED)
5+
find_package(picknik_accessories REQUIRED)
56

7+
install_picknik_accessories(
8+
DESTINATION "share/${PROJECT_NAME}/description"
9+
)
10+
611
install(
712
DIRECTORY
813
config

src/fanuc_sim/package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
<buildtool_depend>ament_cmake</buildtool_depend>
1313

14+
<depend>picknik_accessories</depend>
1415
<exec_depend>admittance_controller</exec_depend>
1516
<exec_depend>kinematics_interface_kdl</exec_depend>
1617
<exec_depend>moveit_planners_stomp</exec_depend>

src/lab_sim/CMakeLists.txt

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,9 @@ project(lab_sim)
44
find_package(ament_cmake REQUIRED)
55
find_package(picknik_accessories REQUIRED)
66

7-
8-
# Install all XML files in directory
9-
set(PICKNIK_ACCESSORIES_SHARE_DIR
10-
"${CMAKE_INSTALL_PREFIX}/../picknik_accessories/share/picknik_accessories/mujoco_assets/"
7+
install_picknik_accessories(
8+
DESTINATION "share/${PROJECT_NAME}/description"
119
)
12-
# Destination directory
13-
set(DEST_DIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/description/")
14-
15-
install(DIRECTORY "${PICKNIK_ACCESSORIES_SHARE_DIR}"
16-
DESTINATION "${DEST_DIR}"
17-
FILES_MATCHING PATTERN "*")
18-
19-
# Install individual XML files
20-
# set(EXTERNAL_XML_FILES
21-
# "${PICKNIK_ACCESSORIES_SHARE_DIR}/ur5e/ur5e_globals.xml"
22-
# "${PICKNIK_ACCESSORIES_SHARE_DIR}/ur5e/ur5e.xml"
23-
# # Add additional files here if desired
24-
# )
25-
# foreach(xml_file IN LISTS EXTERNAL_XML_FILES)
26-
# install(FILES "${xml_file}"
27-
# DESTINATION "${DEST_DIR}"
28-
# )
29-
# endforeach()
30-
3110
install(
3211
DIRECTORY
3312
config

src/lab_sim/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414

1515
<buildtool_depend>ament_cmake</buildtool_depend>
1616

17+
<depend>picknik_accessories</depend>
1718
<exec_depend>admittance_controller</exec_depend>
1819
<exec_depend>moveit_planners_stomp</exec_depend>
1920
<exec_depend>moveit_ros_perception</exec_depend>
2021
<exec_depend>moveit_studio_agent</exec_depend>
2122
<exec_depend>moveit_studio_behavior</exec_depend>
2223
<exec_depend>moveit_studio_ur_pstop_manager</exec_depend>
23-
<exec_depend>picknik_accessories</exec_depend>
2424
<exec_depend>realsense2_camera</exec_depend>
2525
<exec_depend>realsense2_description</exec_depend>
2626
<exec_depend>robotiq_description</exec_depend>

0 commit comments

Comments
 (0)