Skip to content

Commit 8a5d469

Browse files
committed
[CMake] remove catkin dependency
1 parent 1ab5898 commit 8a5d469

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

Diff for: CMakeLists.txt

+8-10
Original file line numberDiff line numberDiff line change
@@ -18,36 +18,34 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
1818
INCLUDE(cmake/base.cmake)
1919
INCLUDE(cmake/python.cmake)
2020

21-
SET(PROJECT_NAME hpp_environments)
21+
SET(PROJECT_NAME hpp-environments)
2222
SET(PROJECT_DESCRIPTION "Environments for the humanoid path planner platform.")
23-
SET(PROJECT_URL "https://github.com/humanoid-path-planner/hpp-environments")
23+
SET(PROJECT_URL "https://github.com/humanoid-path-planner/${PROJECT_NAME}")
24+
STRING(REPLACE "-" "_" ROS_PROJECT_NAME ${PROJECT_NAME})
2425

2526
SETUP_PROJECT()
2627

2728
FINDPYTHON(2.7 EXACT REQUIRED)
2829

29-
FIND_PACKAGE(catkin REQUIRED)
30-
catkin_package()
31-
3230
SET(TEXTURE_FILES
3331
texture/logo_romeo.jpg
3432
)
3533

3634
INSTALL(DIRECTORY urdf
37-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
35+
DESTINATION "share/${ROS_PROJECT_NAME}")
3836

3937
INSTALL(DIRECTORY srdf
40-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
38+
DESTINATION "share/${ROS_PROJECT_NAME}")
4139

4240
INSTALL(DIRECTORY meshes
43-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
41+
DESTINATION "share/${ROS_PROJECT_NAME}")
4442

4543
INSTALL(FILES ${TEXTURE_FILES}
46-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/texture
44+
DESTINATION "share//${ROS_PROJECT_NAME}/texture"
4745
)
4846

4947
INSTALL(FILES package.xml
50-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
48+
DESTINATION "share/${ROS_PROJECT_NAME}")
5149

5250
ADD_SUBDIRECTORY(src)
5351

Diff for: package.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<package>
22
<name>hpp_environments</name>
3-
<version>0.0.0</version>
3+
<version>4.2.0</version>
44
<description>
55
environments for HPP.
66
</description>
77
<author>Joseph Mirabel</author>
88
<maintainer email="[email protected]">Joseph Mirabel</maintainer>
99
<license>LGPL v2</license>
10-
<buildtool_depend>catkin</buildtool_depend>
1110
</package>

0 commit comments

Comments
 (0)