Skip to content

Commit f8841a0

Browse files
author
Enrique Fernández Perdomo
committed
Merge pull request AaronMR#16 from AaronMR/fix_chapter9_depends
Fix chapter 9 depends
2 parents e93f6fd + 5dc9faf commit f8841a0

File tree

2 files changed

+33
-195
lines changed

2 files changed

+33
-195
lines changed

‎chapter9_tutorials/CMakeLists.txt‎

Lines changed: 12 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -1,166 +1,29 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(chapter9_tutorials)
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 COMPONENTS
85
roscpp
9-
rospy
6+
move_base_msgs
7+
actionlib
108
tf
119
)
1210

13-
## System dependencies are found with CMake's conventions
14-
# find_package(Boost REQUIRED COMPONENTS system)
11+
catkin_package()
1512

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-
22-
################################################
23-
## Declare ROS messages, services and actions ##
24-
################################################
25-
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 and a run_depend tag for each package in MSG_DEP_SET
32-
## * If MSG_DEP_SET isn't empty the following dependencies might have been
33-
## pulled in transitively but can be declared for certainty nonetheless:
34-
## * add a build_depend tag for "message_generation"
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-
46-
## Generate messages in the 'msg' folder
47-
# add_message_files(
48-
# FILES
49-
# Message1.msg
50-
# Message2.msg
51-
# )
52-
53-
## Generate services in the 'srv' folder
54-
# add_service_files(
55-
# FILES
56-
# Service1.srv
57-
# Service2.srv
58-
# )
59-
60-
## Generate actions in the 'action' folder
61-
# add_action_files(
62-
# FILES
63-
# Action1.action
64-
# Action2.action
65-
# )
66-
67-
## Generate added messages and services with any dependencies listed here
68-
# generate_messages(
69-
# DEPENDENCIES
70-
# std_msgs # Or other packages containing msgs
71-
# )
72-
73-
###################################
74-
## catkin specific configuration ##
75-
###################################
76-
## The catkin_package macro generates cmake config files for your package
77-
## Declare things to be passed to dependent projects
78-
## INCLUDE_DIRS: uncomment this if you package contains header files
79-
## LIBRARIES: libraries you create in this project that dependent projects also need
80-
## CATKIN_DEPENDS: catkin_packages dependent projects also need
81-
## DEPENDS: system dependencies of this project that dependent projects also need
82-
catkin_package(
83-
# INCLUDE_DIRS include
84-
# LIBRARIES chapter9_tutorials
85-
# CATKIN_DEPENDS roscpp rospy
86-
# DEPENDS system_lib
87-
)
88-
89-
###########
90-
## Build ##
91-
###########
92-
93-
## Specify additional locations of header files
94-
## Your package locations should be listed before other locations
95-
# include_directories(include)
9613
include_directories(
9714
${catkin_INCLUDE_DIRS}
9815
)
9916

100-
## Declare a cpp library
101-
# add_library(chapter9_tutorials
102-
# src/${PROJECT_NAME}/chapter9_tutorials.cpp
103-
# )
104-
105-
## Declare a cpp executable
106-
# add_executable(chapter9_tutorials_node src/chapter9_tutorials_node.cpp)
10717
add_executable(sendGoals src/sendGoals.cpp)
108-
109-
## Add cmake target dependencies of the executable/library
110-
## as an example, message headers may need to be generated before nodes
111-
# add_dependencies(chapter9_tutorials_node chapter9_tutorials_generate_messages_cpp)
112-
113-
## Specify libraries to link a library or executable target against
114-
# target_link_libraries(chapter9_tutorials_node
115-
# ${catkin_LIBRARIES}
116-
# )
117-
11818
target_link_libraries(sendGoals ${catkin_LIBRARIES})
11919

120-
#############
121-
## Install ##
122-
#############
123-
124-
# all install targets should use catkin DESTINATION variables
125-
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
126-
127-
## Mark executable scripts (Python etc.) for installation
128-
## in contrast to setup.py, you can choose the destination
129-
# install(PROGRAMS
130-
# scripts/my_python_script
131-
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
132-
# )
133-
134-
## Mark executables and/or libraries for installation
135-
# install(TARGETS chapter9_tutorials chapter9_tutorials_node
136-
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
137-
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
138-
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
139-
# )
140-
141-
## Mark cpp header files for installation
142-
# install(DIRECTORY include/${PROJECT_NAME}/
143-
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
144-
# FILES_MATCHING PATTERN "*.h"
145-
# PATTERN ".svn" EXCLUDE
146-
# )
147-
148-
## Mark other files for installation (e.g. launch and bag files, etc.)
149-
# install(FILES
150-
# # myfile1
151-
# # myfile2
152-
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
153-
# )
154-
155-
#############
156-
## Testing ##
157-
#############
158-
159-
## Add gtest based cpp test target and link libraries
160-
# catkin_add_gtest(${PROJECT_NAME}-test test/test_chapter9_tutorials.cpp)
161-
# if(TARGET ${PROJECT_NAME}-test)
162-
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
163-
# endif()
20+
install(TARGETS sendGoals
21+
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
22+
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
23+
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
24+
)
16425

165-
## Add folders to be run by python nosetests
166-
# catkin_add_nosetests(test)
26+
foreach(dir launch maps)
27+
install(DIRECTORY ${dir}/
28+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
29+
endforeach(dir)

‎chapter9_tutorials/package.xml‎

Lines changed: 21 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,29 @@
44
<version>0.0.0</version>
55
<description>The chapter9_tutorials package</description>
66

7-
<!-- One maintainer tag required, multiple allowed, one person per tag -->
8-
<!-- Example: -->
9-
<!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
10-
<maintainer email="retrorov-laptop@todo.todo">retrorov-laptop</maintainer>
7+
<maintainer email="enrique.fernandez.perdomo@gmail.com">Enrique Fernandez</maintainer>
8+
<author email="enrique.fernandez.perdomo@gmail.com">Enrique Fernandez</author>
119

10+
<license>BSD</license>
1211

13-
<!-- One license tag required, multiple allowed, one license per tag -->
14-
<!-- Commonly used license strings: -->
15-
<!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
16-
<license>TODO</license>
17-
18-
19-
<!-- Url tags are optional, but mutiple are allowed, one per tag -->
20-
<!-- Optional attribute type can be: website, bugtracker, or repository -->
21-
<!-- Example: -->
22-
<!-- <url type="website">http://wiki.ros.org/chapter9_tutorials</url> -->
23-
24-
25-
<!-- Author tags are optional, mutiple are allowed, one per tag -->
26-
<!-- Authors do not have to be maintianers, but could be -->
27-
<!-- Example: -->
28-
<!-- <author email="jane.doe@example.com">Jane Doe</author> -->
29-
30-
31-
<!-- The *_depend tags are used to specify dependencies -->
32-
<!-- Dependencies can be catkin packages or system dependencies -->
33-
<!-- Examples: -->
34-
<!-- Use build_depend for packages you need at compile time: -->
35-
<!-- <build_depend>message_generation</build_depend> -->
36-
<!-- Use buildtool_depend for build tool packages: -->
37-
<!-- <buildtool_depend>catkin</buildtool_depend> -->
38-
<!-- Use run_depend for packages you need at runtime: -->
39-
<!-- <run_depend>message_runtime</run_depend> -->
40-
<!-- Use test_depend for packages you need only for testing: -->
41-
<!-- <test_depend>gtest</test_depend> -->
4212
<buildtool_depend>catkin</buildtool_depend>
43-
<build_depend>roscpp</build_depend>
44-
<build_depend>rospy</build_depend>
45-
<run_depend>roscpp</run_depend>
46-
<run_depend>rospy</run_depend>
47-
4813

49-
<!-- The export tag contains other, unspecified, tags -->
50-
<export>
51-
<!-- You can specify that this package is a metapackage here: -->
52-
<!-- <metapackage/> -->
53-
54-
<!-- Other tools can request additional information be placed here -->
14+
<build_depend>roscpp</build_depend>
15+
<build_depend>move_base_msgs</build_depend>
16+
<build_depend>actionlib</build_depend>
17+
<build_depend>tf</build_depend>
5518

56-
</export>
57-
</package>
19+
<run_depend>roscpp</run_depend>
20+
<run_depend>move_base_msgs</run_depend>
21+
<run_depend>actionlib</run_depend>
22+
<run_depend>tf</run_depend>
23+
<run_depend>amcl</run_depend>
24+
<run_depend>gazebo_ros</run_depend>
25+
<run_depend>xacro</run_depend>
26+
<run_depend>move_base</run_depend>
27+
<run_depend>map_server</run_depend>
28+
<run_depend>joint_state_publisher</run_depend>
29+
<run_depend>robot_state_publisher</run_depend>
30+
<run_depend>rviz</run_depend>
31+
<run_depend>robot1_description</run_depend>
32+
</package>

0 commit comments

Comments
 (0)