Skip to content

Commit d24e5fa

Browse files
author
Felix Maisonneuve
committed
fix catkin_make install that was failing
1 parent 476faba commit d24e5fa

File tree

3 files changed

+10
-14
lines changed

3 files changed

+10
-14
lines changed

kortex_examples/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ find_package(catkin REQUIRED COMPONENTS roscpp rospy std_msgs message_generation
1010

1111
## Declare a catkin package
1212
catkin_package()
13-
catkin_python_setup()
1413

1514
include_directories(include ${catkin_INCLUDE_DIRS})
1615
include_directories(include ${PROJECT_SOURCE_DIR}/src)

kortex_examples/setup.py

Lines changed: 0 additions & 7 deletions
This file was deleted.

kortex_gazebo/CMakeLists.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,16 @@ find_package(gazebo)
1111

1212
catkin_package()
1313

14-
find_package(roslaunch)
15-
16-
foreach(dir config launch meshes urdf)
17-
install(DIRECTORY ${dir}/
18-
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
19-
endforeach(dir)
14+
# Install
15+
install(PROGRAMS
16+
scripts/home_robot.py
17+
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
18+
)
19+
20+
install(DIRECTORY launch
21+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
22+
FILES_MATCHING PATTERN "*.launch"
23+
)
2024

2125
# Gazebo is compiled with Protobuf 2.6.1 and Kortex with Protobuf 3.5.1
2226
# The 2.6.1 includes are prepended to the include_directories so the Gazebo plugins we compile here build

0 commit comments

Comments
 (0)