Skip to content

Commit 86e5d62

Browse files
hershwghershwg
committed
catkinized librviz_tutorial, rviz_plugin_tutorials, and rviz_python_tutorial
1 parent 1ad052e commit 86e5d62

File tree

12 files changed

+86
-66
lines changed

12 files changed

+86
-66
lines changed

‎librviz_tutorial/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
## BEGIN_TUTORIAL
22
## This CMakeLists.txt file for rviz_plugin_tutorials builds both the TeleopPanel tutorial and the ImuDisplay tutorial.
33
##
4-
## First start with some standard ROS stuff.
5-
cmake_minimum_required(VERSION 2.4.6)
6-
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
7-
set(ROS_BUILD_TYPE RelWithDebInfo)
8-
rosbuild_init()
4+
## First start with some standard catkin stuff.
5+
cmake_minimum_required(VERSION 2.8.3)
6+
project(librviz_tutorial)
7+
find_package(catkin REQUIRED COMPONENTS rviz roscpp)
8+
catkin_package()
9+
include_directories(${catkin_INCLUDE_DIRS})
10+
link_directories(${catkin_LIBRARY_DIRS})
911

1012
## This plugin includes Qt widgets, so we must include Qt like so:
1113
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
@@ -29,14 +31,12 @@ set(SOURCE_FILES
2931
${MOC_FILES}
3032
)
3133

32-
## Set the default path for built binaries to the "bin" directory
33-
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
34-
3534
## Add the "myviz" executable and specify the list of source files we
3635
## collected above in ``${SOURCE_FILES}``.
37-
rosbuild_add_executable(myviz ${SOURCE_FILES})
36+
add_executable(myviz ${SOURCE_FILES})
3837

3938
## Link the myviz executable with whatever Qt libraries have been defined by
40-
## the ``find_package(Qt4 ...)`` line above.
41-
target_link_libraries(myviz ${QT_LIBRARIES} default_plugin)
39+
## the ``find_package(Qt4 ...)`` line above, and with whatever libraries
40+
## catkin has included.
41+
target_link_libraries(myviz ${QT_LIBRARIES} default_plugin ${catkin_LIBRARIES})
4242
## END_TUTORIAL

‎librviz_tutorial/Makefile

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

‎librviz_tutorial/manifest.xml

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

‎librviz_tutorial/package.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<package>
2+
<name>librviz_tutorial</name>
3+
<version>0.8.0</version>
4+
<description>
5+
Tutorial showing how to compile your own C++ program with RViz displays and features.
6+
</description>
7+
<maintainer email="[email protected]">Dave Hershberger</maintainer>
8+
<license>BSD</license>
9+
10+
<url>http://ros.org/wiki/librviz_tutorial</url>
11+
<author>Dave Hershberger</author>
12+
13+
<buildtool_depend>catkin</buildtool_depend>
14+
15+
<build_depend>roscpp</build_depend>
16+
<build_depend>rviz</build_depend>
17+
18+
<run_depend>roscpp</run_depend>
19+
<run_depend>rviz</run_depend>
20+
21+
<export>
22+
<rosdoc config="${prefix}/rosdoc.yaml"/>
23+
</export>
24+
</package>

‎rviz_plugin_tutorials/CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
## BEGIN_TUTORIAL
22
## This CMakeLists.txt file for rviz_plugin_tutorials builds both the TeleopPanel tutorial and the ImuDisplay tutorial.
33
##
4-
## First start with some standard ROS stuff.
5-
cmake_minimum_required(VERSION 2.4.6)
6-
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
7-
set(ROS_BUILD_TYPE RelWithDebInfo)
8-
rosbuild_init()
4+
## First start with some standard catkin stuff.
5+
cmake_minimum_required(VERSION 2.8.3)
6+
project(rviz_plugin_tutorials)
7+
find_package(catkin REQUIRED COMPONENTS rviz)
8+
catkin_package()
9+
include_directories(${catkin_INCLUDE_DIRS})
10+
link_directories(${catkin_LIBRARY_DIRS})
911

1012
## This plugin includes Qt widgets, so we must include Qt like so:
1113
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
@@ -35,23 +37,21 @@ set(SOURCE_FILES
3537
${MOC_FILES}
3638
)
3739

38-
## Set the default path for built libraries to the "lib" directory
39-
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)
40-
4140
## An rviz plugin is just a shared library, so here we declare the
4241
## library to be called ``${PROJECT_NAME}`` (which is
4342
## "rviz_plugin_tutorials", or whatever your version of this project
4443
## is called) and specify the list of source files we collected above
4544
## in ``${SOURCE_FILES}``.
46-
rosbuild_add_library(${PROJECT_NAME} ${SOURCE_FILES})
45+
add_library(${PROJECT_NAME} ${SOURCE_FILES})
4746

4847
## Link the library with whatever Qt libraries have been defined by
49-
## the ``find_package(Qt4 ...)`` line above.
48+
## the ``find_package(Qt4 ...)`` line above, and with whatever libraries
49+
## catkin has included.
5050
##
5151
## Although this puts "rviz_plugin_tutorials" (or whatever you have
5252
## called the project) as the name of the library, cmake knows it is a
5353
## library and names the actual file something like
5454
## "librviz_plugin_tutorials.so", or whatever is appropriate for your
5555
## particular OS.
56-
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
56+
target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES} ${catkin_LIBRARIES})
5757
## END_TUTORIAL

‎rviz_plugin_tutorials/Makefile

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

‎rviz_plugin_tutorials/media/flag.dae

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
</contributor>
1111
<created>2011-03-16T15:32:31.374173</created>
1212
<modified>2011-03-16T15:32:31.374204</modified>
13-
<unit meter="0.01" name="centimeter"/>
1413
<up_axis>Z_UP</up_axis>
1514
</asset>
1615
<library_effects>

‎rviz_plugin_tutorials/manifest.xml renamed to ‎rviz_plugin_tutorials/package.xml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
<package>
2-
<description brief="RViz plugin tutorials">
3-
2+
<name>rviz_plugin_tutorials</name>
3+
<version>0.8.0</version>
4+
<description>
45
Tutorials showing how to write plugins for RViz.
5-
66
</description>
7-
<author>Dave Hershberger</author>
7+
<maintainer email="[email protected]">Dave Hershberger</maintainer>
88
<license>BSD</license>
9-
<review status="unreviewed" notes=""/>
9+
1010
<url>http://ros.org/wiki/rviz_plugin_tutorials</url>
11-
<depend package="rviz"/>
11+
<author>Dave Hershberger</author>
12+
13+
<buildtool_depend>catkin</buildtool_depend>
14+
15+
<build_depend>rviz</build_depend>
16+
17+
<run_depend>rviz</run_depend>
18+
1219
<export>
1320
<rosdoc config="${prefix}/rosdoc.yaml"/>
1421
<rviz plugin="${prefix}/plugin_description.xml"/>

‎rviz_python_tutorial/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
cmake_minimum_required(VERSION 2.4.6)
2-
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
3-
rosbuild_init()
1+
cmake_minimum_required(VERSION 2.8.3)
2+
project(rviz_python_tutorial)
3+
find_package(catkin REQUIRED COMPONENTS rviz)
4+
catkin_package()

‎rviz_python_tutorial/Makefile

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

‎rviz_python_tutorial/manifest.xml

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

‎rviz_python_tutorial/package.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<package>
2+
<name>rviz_python_tutorial</name>
3+
<version>0.8.0</version>
4+
<description>
5+
Tutorials showing how to call into rviz internals from python scripts.
6+
</description>
7+
<maintainer email="[email protected]">Dave Hershberger</maintainer>
8+
<license>BSD</license>
9+
10+
<url>http://ros.org/wiki/rviz_python_tutorial</url>
11+
<author>Dave Hershberger</author>
12+
13+
<buildtool_depend>catkin</buildtool_depend>
14+
15+
<build_depend>rviz</build_depend>
16+
17+
<run_depend>rviz</run_depend>
18+
19+
<export>
20+
<rosdoc config="${prefix}/rosdoc.yaml"/>
21+
<rviz plugin="${prefix}/plugin_description.xml"/>
22+
</export>
23+
</package>

0 commit comments

Comments
 (0)