Skip to content

Commit 2f14ae4

Browse files
committed
port cob_description
1 parent 030766f commit 2f14ae4

File tree

3 files changed

+21
-9
lines changed

3 files changed

+21
-9
lines changed

cob_description/CMakeLists.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1-
cmake_minimum_required(VERSION 3.0.2)
1+
cmake_minimum_required(VERSION 3.5)
22
project(cob_description)
33

4-
find_package(catkin REQUIRED COMPONENTS)
5-
6-
catkin_package()
4+
find_package(ament_cmake REQUIRED)
75

86
install(DIRECTORY Media meshes urdf
9-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
7+
DESTINATION share/${PROJECT_NAME}
108
)
119

12-
catkin_install_python(PROGRAMS test/test_urdf.py
13-
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
10+
install(PROGRAMS test/test_urdf.py
11+
DESTINATION share/${PROJECT_NAME}/test
1412
)
13+
14+
if(BUILD_TESTING)
15+
find_package(ament_lint_auto REQUIRED)
16+
ament_lint_auto_find_test_dependencies()
17+
endif()
18+
19+
ament_package()

cob_description/COLCON_IGNORE

Whitespace-only changes.

cob_description/package.xml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<package format="2">
1+
<?xml version="1.0"?>
2+
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
3+
<package format="3">
24
<name>cob_description</name>
35
<version>0.7.8</version>
46
<description>This package contains the description (mechanical, kinematic, visual,
@@ -16,15 +18,20 @@
1618
<author email="[email protected]">Florian Weisshardt</author>
1719
<author email="[email protected]">Felix Messmer</author>
1820

19-
<buildtool_depend>catkin</buildtool_depend>
21+
<buildtool_depend>ament_cmake</buildtool_depend>
2022

2123
<exec_depend>gazebo_ros</exec_depend>
2224
<exec_depend>rosbash</exec_depend>
2325
<exec_depend>rospy</exec_depend>
2426
<exec_depend>rosunit</exec_depend>
2527
<exec_depend>xacro</exec_depend>
2628

29+
<test_depend>ament_cmake_gtest</test_depend>
30+
<test_depend>ament_lint_auto</test_depend>
31+
<test_depend>ament_lint_common</test_depend>
32+
2733
<export>
2834
<gazebo_ros gazebo_media_path="${prefix}"/>
35+
<build_type>ament_cmake</build_type>
2936
</export>
3037
</package>

0 commit comments

Comments
 (0)