Skip to content

Commit 5f0f49e

Browse files
committed
Official 14.04 on Indigo
1 parent 1f04440 commit 5f0f49e

File tree

2 files changed

+2
-154
lines changed

2 files changed

+2
-154
lines changed

CMakeLists.txt

Lines changed: 1 addition & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,16 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(dbot_ros_msgs)
33

4-
## Find catkin macros and libraries
5-
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
6-
## is used, also find other catkin packages
74
find_package(catkin REQUIRED
85
sensor_msgs
96
std_msgs
107
message_generation
118
)
129

13-
## System dependencies are found with CMake's conventions
14-
# find_package(Boost REQUIRED COMPONENTS system)
15-
16-
17-
## Uncomment this if the package has a setup.py. This macro ensures
18-
## modules and global scripts declared therein get installed
19-
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
20-
# catkin_python_setup()
21-
2210
################################################
2311
## Declare ROS messages, services and actions ##
2412
################################################
2513

26-
## To declare and build messages, services or actions from within this
27-
## package, follow these steps:
28-
## * Let MSG_DEP_SET be the set of packages whose message types you use in
29-
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
30-
## * In the file package.xml:
31-
## * add a build_depend tag for "message_generation"
32-
## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
33-
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
34-
## but can be declared for certainty nonetheless:
35-
## * add a run_depend tag for "message_runtime"
36-
## * In this file (CMakeLists.txt):
37-
## * add "message_generation" and every package in MSG_DEP_SET to
38-
## find_package(catkin REQUIRED COMPONENTS ...)
39-
## * add "message_runtime" and every package in MSG_DEP_SET to
40-
## catkin_package(CATKIN_DEPENDS ...)
41-
## * uncomment the add_*_files sections below as needed
42-
## and list every .msg/.srv/.action file to be processed
43-
## * uncomment the generate_messages entry below
44-
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
45-
4614
## Generate messages in the 'msg' folder
4715
add_message_files(
4816
FILES
@@ -65,129 +33,9 @@ generate_messages(
6533
geometry_msgs
6634
)
6735

68-
## Generate actions in the 'action' folder
69-
# add_action_files(
70-
# FILES
71-
# Action1.action
72-
# Action2.action
73-
# )
74-
75-
## Generate added messages and services with any dependencies listed here
76-
# generate_messages(
77-
# DEPENDENCIES
78-
# std_msgs # Or other packages containing msgs
79-
# )
80-
81-
################################################
82-
## Declare ROS dynamic reconfigure parameters ##
83-
################################################
84-
85-
## To declare and build dynamic reconfigure parameters within this
86-
## package, follow these steps:
87-
## * In the file package.xml:
88-
## * add a build_depend and a run_depend tag for "dynamic_reconfigure"
89-
## * In this file (CMakeLists.txt):
90-
## * add "dynamic_reconfigure" to
91-
## find_package(catkin REQUIRED COMPONENTS ...)
92-
## * uncomment the "generate_dynamic_reconfigure_options" section below
93-
## and list every .cfg file to be processed
94-
95-
## Generate dynamic reconfigure parameters in the 'cfg' folder
96-
# generate_dynamic_reconfigure_options(
97-
# cfg/DynReconf1.cfg
98-
# cfg/DynReconf2.cfg
99-
# )
10036

10137
###################################
10238
## catkin specific configuration ##
10339
###################################
104-
## The catkin_package macro generates cmake config files for your package
105-
## Declare things to be passed to dependent projects
106-
## INCLUDE_DIRS: uncomment this if you package contains header files
107-
## LIBRARIES: libraries you create in this project that dependent projects also need
108-
## CATKIN_DEPENDS: catkin_packages dependent projects also need
109-
## DEPENDS: system dependencies of this project that dependent projects also need
110-
catkin_package(
111-
# INCLUDE_DIRS include
112-
# LIBRARIES dbot_ros_msg
113-
# CATKIN_DEPENDS other_catkin_pkg
114-
# DEPENDS system_lib
115-
)
116-
117-
###########
118-
## Build ##
119-
###########
120-
121-
## Specify additional locations of header files
122-
## Your package locations should be listed before other locations
123-
# include_directories(include)
124-
125-
## Declare a C++ library
126-
# add_library(dbot_ros_msg
127-
# src/${PROJECT_NAME}/dbot_ros_msg.cpp
128-
# )
129-
130-
## Add cmake target dependencies of the library
131-
## as an example, code may need to be generated before libraries
132-
## either from message generation or dynamic reconfigure
133-
# add_dependencies(dbot_ros_msg ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
134-
135-
## Declare a C++ executable
136-
# add_executable(dbot_ros_msg_node src/dbot_ros_msg_node.cpp)
137-
138-
## Add cmake target dependencies of the executable
139-
## same as for the library above
140-
# add_dependencies(dbot_ros_msg_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
141-
142-
## Specify libraries to link a library or executable target against
143-
# target_link_libraries(dbot_ros_msg_node
144-
# ${catkin_LIBRARIES}
145-
# )
146-
147-
#############
148-
## Install ##
149-
#############
150-
151-
# all install targets should use catkin DESTINATION variables
152-
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
153-
154-
## Mark executable scripts (Python etc.) for installation
155-
## in contrast to setup.py, you can choose the destination
156-
# install(PROGRAMS
157-
# scripts/my_python_script
158-
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
159-
# )
160-
161-
## Mark executables and/or libraries for installation
162-
# install(TARGETS dbot_ros_msg dbot_ros_msg_node
163-
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
164-
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
165-
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
166-
# )
167-
168-
## Mark cpp header files for installation
169-
# install(DIRECTORY include/${PROJECT_NAME}/
170-
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
171-
# FILES_MATCHING PATTERN "*.h"
172-
# PATTERN ".svn" EXCLUDE
173-
# )
174-
175-
## Mark other files for installation (e.g. launch and bag files, etc.)
176-
# install(FILES
177-
# # myfile1
178-
# # myfile2
179-
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
180-
# )
181-
182-
#############
183-
## Testing ##
184-
#############
185-
186-
## Add gtest based cpp test target and link libraries
187-
# catkin_add_gtest(${PROJECT_NAME}-test test/test_dbot_ros_msg.cpp)
188-
# if(TARGET ${PROJECT_NAME}-test)
189-
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
190-
# endif()
40+
catkin_package()
19141

192-
## Add folders to be run by python nosetests
193-
# catkin_add_nosetests(test)

msg/ObjectState.msg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
string name
22
ObjectOri ori
33
geometry_msgs/PoseStamped pose
4-
geometry_msgs/PoseStamped velocity
4+
geometry_msgs/TwistStamped velocity

0 commit comments

Comments
 (0)