Skip to content

Commit 9faae60

Browse files
author
David Gossow
committed
catkinized interactive_marker_tutorials
1 parent e4d152d commit 9faae60

File tree

8 files changed

+114
-51
lines changed

8 files changed

+114
-51
lines changed

‎interactive_marker_tutorials/CMakeLists.txt

Lines changed: 84 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,84 @@
1-
cmake_minimum_required(VERSION 2.4.6)
2-
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
3-
4-
# Set the build type. Options are:
5-
# Coverage : w/ debug symbols, w/o optimization, w/ code-coverage
6-
# Debug : w/ debug symbols, w/o optimization
7-
# Release : w/o debug symbols, w/ optimization
8-
# RelWithDebInfo : w/ debug symbols, w/ optimization
9-
# MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries
10-
#set(ROS_BUILD_TYPE RelWithDebInfo)
11-
12-
rosbuild_init()
13-
14-
#set the default path for built executables to the "bin" directory
15-
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
16-
#set the default path for built libraries to the "lib" directory
17-
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
18-
19-
#uncomment if you have defined messages
20-
#rosbuild_genmsg()
21-
#uncomment if you have defined services
22-
#rosbuild_gensrv()
23-
24-
rosbuild_add_executable(simple_marker src/simple_marker.cpp)
25-
rosbuild_add_executable(basic_controls src/basic_controls.cpp)
26-
rosbuild_add_executable(selection src/selection.cpp)
27-
rosbuild_add_executable(pong src/pong.cpp)
28-
rosbuild_add_executable(cube src/cube.cpp)
29-
rosbuild_add_executable(menu src/menu.cpp)
30-
rosbuild_add_executable(point_cloud src/point_cloud.cpp)
1+
cmake_minimum_required(VERSION 2.8.3)
2+
project(interactive_marker_tutorials)
3+
4+
find_package(catkin REQUIRED COMPONENTS interactive_markers roscpp visualization_msgs tf)
5+
6+
###################################
7+
## catkin specific configuration ##
8+
###################################
9+
## The catkin_package macro generates cmake config files for your package
10+
## Declare things to be passed to dependent projects
11+
## LIBRARIES: libraries you create in this project that dependent projects also need
12+
## CATKIN_DEPENDS: catkin_packages dependent projects also need
13+
## DEPENDS: system dependencies of this project that dependent projects also need
14+
catkin_package(
15+
CATKIN_DEPENDS interactive_markers roscpp visualization_msgs tf
16+
)
17+
18+
###########
19+
## Build ##
20+
###########
21+
22+
include_directories(include
23+
${catkin_INCLUDE_DIRS}
24+
)
25+
26+
add_executable(simple_marker src/simple_marker.cpp)
27+
target_link_libraries(simple_marker
28+
${catkin_LIBRARIES}
29+
)
30+
31+
add_executable(basic_controls src/basic_controls.cpp)
32+
target_link_libraries(basic_controls
33+
${catkin_LIBRARIES}
34+
)
35+
36+
add_executable(selection src/selection.cpp)
37+
target_link_libraries(selection
38+
${catkin_LIBRARIES}
39+
)
40+
41+
add_executable(pong src/pong.cpp)
42+
target_link_libraries(pong
43+
${catkin_LIBRARIES}
44+
)
45+
46+
add_executable(cube src/cube.cpp)
47+
target_link_libraries(cube
48+
${catkin_LIBRARIES}
49+
)
50+
51+
add_executable(menu src/menu.cpp)
52+
target_link_libraries(menu
53+
${catkin_LIBRARIES}
54+
)
55+
56+
add_executable(point_cloud src/point_cloud.cpp)
57+
target_link_libraries(point_cloud
58+
${catkin_LIBRARIES}
59+
)
60+
#############
61+
## Install ##
62+
#############
63+
64+
install(PROGRAMS
65+
scripts/basic_controls.py
66+
scripts/cube.py
67+
scripts/menu.py
68+
scripts/simple_marker.py
69+
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
70+
)
71+
72+
## Mark executables and/or libraries for installation
73+
install(TARGETS
74+
simple_marker
75+
basic_controls
76+
selection
77+
pong
78+
cube
79+
menu
80+
point_cloud
81+
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
82+
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
83+
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
84+
)

‎interactive_marker_tutorials/Makefile

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎interactive_marker_tutorials/manifest.xml

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

‎interactive_marker_tutorials/package.xml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0"?>
2+
<package>
3+
4+
<name>interactive_marker_tutorials</name>
5+
<version>0.8.0</version>
6+
<description>The interactive_marker_tutorials package</description>
7+
8+
<maintainer email="[email protected]">David Gossow</maintainer>
9+
10+
<license>BSD</license>
11+
<url type="website">http://ros.org/wiki/interactive_marker_tutorials</url>
12+
13+
<author >David Gossow</author>
14+
15+
<buildtool_depend>catkin</buildtool_depend>
16+
17+
<build_depend>roscpp</build_depend>
18+
<build_depend>interactive_markers</build_depend>
19+
<build_depend>visualization_msgs</build_depend>
20+
<build_depend>tf</build_depend>
21+
22+
<run_depend>roscpp</run_depend>
23+
<run_depend>interactive_markers</run_depend>
24+
<run_depend>visualization_msgs</run_depend>
25+
<run_depend>tf</run_depend>
26+
27+
<export>
28+
</export>
29+
30+
</package>

‎interactive_marker_tutorials/python/basic_controls.py renamed to ‎interactive_marker_tutorials/scripts/basic_controls.py

File renamed without changes.

‎interactive_marker_tutorials/python/cube.py renamed to ‎interactive_marker_tutorials/scripts/cube.py

File renamed without changes.

‎interactive_marker_tutorials/python/menu.py renamed to ‎interactive_marker_tutorials/scripts/menu.py

File renamed without changes.

‎interactive_marker_tutorials/python/simple_marker.py renamed to ‎interactive_marker_tutorials/scripts/simple_marker.py

File renamed without changes.

0 commit comments

Comments
 (0)