Skip to content

Commit 1ad052e

Browse files
author
David Gossow
committed
catkinized visualization_marker_tutorials
1 parent 9faae60 commit 1ad052e

File tree

4 files changed

+74
-45
lines changed

4 files changed

+74
-45
lines changed
Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,48 @@
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(basic_shapes src/basic_shapes.cpp)
25-
rosbuild_add_executable(points_and_lines src/points_and_lines.cpp)
1+
cmake_minimum_required(VERSION 2.8.3)
2+
project(visualization_marker_tutorials)
3+
4+
find_package(catkin REQUIRED COMPONENTS roscpp visualization_msgs)
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+
15+
catkin_package(
16+
CATKIN_DEPENDS roscpp visualization_msgs
17+
)
18+
19+
###########
20+
## Build ##
21+
###########
22+
23+
include_directories(include
24+
${catkin_INCLUDE_DIRS}
25+
)
26+
27+
add_executable(basic_shapes src/basic_shapes.cpp)
28+
target_link_libraries(basic_shapes
29+
${catkin_LIBRARIES}
30+
)
31+
32+
add_executable(points_and_lines src/points_and_lines.cpp)
33+
target_link_libraries(points_and_lines
34+
${catkin_LIBRARIES}
35+
)
36+
37+
#############
38+
## Install ##
39+
#############
40+
41+
## Mark executables and/or libraries for installation
42+
install(TARGETS
43+
basic_shapes
44+
points_and_lines
45+
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
46+
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
47+
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
48+
)

visualization_marker_tutorials/Makefile

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

visualization_marker_tutorials/manifest.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<?xml version="1.0"?>
2+
<package>
3+
4+
<name>visualization_marker_tutorials</name>
5+
<version>0.8.0</version>
6+
<description>The visulalization_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/visualization_marker_tutorials</url>
12+
13+
<author>Josh Faust</author>
14+
15+
<buildtool_depend>catkin</buildtool_depend>
16+
17+
<build_depend>roscpp</build_depend>
18+
<build_depend>visualization_msgs</build_depend>
19+
20+
<run_depend>roscpp</run_depend>
21+
<run_depend>visualization_msgs</run_depend>
22+
23+
<export>
24+
</export>
25+
26+
</package>

0 commit comments

Comments
 (0)