Skip to content

Commit ccafe35

Browse files
wjwwoodwjwwood
committed
install files and fixup CMakeLists.txt
1 parent a64d58a commit ccafe35

File tree

5 files changed

+26
-262
lines changed

5 files changed

+26
-262
lines changed

‎custom_plugin_tutorial/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ cmake_minimum_required(VERSION 2.8.3)
22
project(gazebo_tutorials)
33

44
# Load catkin and all dependencies required for this package
5-
find_package(catkin REQUIRED COMPONENTS
6-
roscpp
7-
gazebo_ros
5+
find_package(catkin REQUIRED COMPONENTS
6+
roscpp
7+
gazebo_ros
88
)
99

1010
# Depend on system install of Gazebo
@@ -17,7 +17,7 @@ add_library(${PROJECT_NAME} src/simple_world_plugin.cpp)
1717
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${GAZEBO_LIBRARIES})
1818

1919
catkin_package(
20-
DEPENDS
21-
roscpp
22-
gazebo_ros
20+
DEPENDS
21+
roscpp
22+
gazebo_ros
2323
)

‎rrbot_control/CMakeLists.txt

+5-121
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,12 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(rrbot_control)
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

9-
## System dependencies are found with CMake's conventions
10-
# find_package(Boost REQUIRED COMPONENTS system)
6+
catkin_package()
117

8+
install(DIRECTORY config
9+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
1210

13-
## Uncomment this if the package has a setup.py. This macro ensures
14-
## modules and global scripts declared therein get installed
15-
## See http://ros.org/doc/groovy/api/catkin/html/user_guide/setup_dot_py.html
16-
# catkin_python_setup()
17-
18-
#######################################
19-
## Declare ROS messages and services ##
20-
#######################################
21-
22-
## Generate messages in the 'msg' folder
23-
# add_message_files(
24-
# FILES
25-
# Message1.msg
26-
# Message2.msg
27-
# )
28-
29-
## Generate services in the 'srv' folder
30-
# add_service_files(
31-
# FILES
32-
# Service1.srv
33-
# Service2.srv
34-
# )
35-
36-
## Generate added messages and services with any dependencies listed here
37-
# generate_messages(
38-
# DEPENDENCIES
39-
# std_msgs # Or other packages containing msgs
40-
# )
41-
42-
###################################
43-
## catkin specific configuration ##
44-
###################################
45-
## The catkin_package macro generates cmake config files for your package
46-
## Declare things to be passed to dependent projects
47-
## LIBRARIES: libraries you create in this project that dependent projects also need
48-
## CATKIN_DEPENDS: catkin_packages dependent projects also need
49-
## DEPENDS: system dependencies of this project that dependent projects also need
50-
catkin_package(
51-
# INCLUDE_DIRS include
52-
# LIBRARIES rrbot_control
53-
# CATKIN_DEPENDS other_catkin_pkg
54-
# DEPENDS system_lib
55-
)
56-
57-
###########
58-
## Build ##
59-
###########
60-
61-
## Specify additional locations of header files
62-
## Your package locations should be listed before other locations
63-
# include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
64-
65-
## Declare a cpp library
66-
# add_library(rrbot_control
67-
# src/${PROJECT_NAME}/rrbot_control.cpp
68-
# )
69-
70-
## Declare a cpp executable
71-
# add_executable(rrbot_control_node src/rrbot_control_node.cpp)
72-
73-
## Add cmake target dependencies of the executable/library
74-
## as an example, message headers may need to be generated before nodes
75-
# add_dependencies(rrbot_control_node rrbot_control_generate_messages_cpp)
76-
77-
## Specify libraries to link a library or executable target against
78-
# target_link_libraries(rrbot_control_node
79-
# ${catkin_LIBRARIES}
80-
# )
81-
82-
#############
83-
## Install ##
84-
#############
85-
86-
# all install targets should use catkin DESTINATION variables
87-
# See http://ros.org/doc/groovy/api/catkin/html/adv_user_guide/variables.html
88-
89-
## Mark executable scripts (Python etc.) for installation
90-
## in contrast to setup.py, you can choose the destination
91-
# install(PROGRAMS
92-
# scripts/my_python_script
93-
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
94-
# )
95-
96-
## Mark executables and/or libraries for installation
97-
# install(TARGETS rrbot_control rrbot_control_node
98-
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
99-
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
100-
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
101-
# )
102-
103-
## Mark cpp header files for installation
104-
# install(DIRECTORY include/${PROJECT_NAME}/
105-
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
106-
# FILES_MATCHING PATTERN "*.h"
107-
# PATTERN ".svn" EXCLUDE
108-
# )
109-
110-
## Mark other files for installation (e.g. launch and bag files, etc.)
111-
# install(FILES
112-
# # myfile1
113-
# # myfile2
114-
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
115-
# )
116-
117-
#############
118-
## Testing ##
119-
#############
120-
121-
## Add gtest based cpp test target and link libraries
122-
# catkin_add_gtest(${PROJECT_NAME}-test test/test_rrbot_control.cpp)
123-
# if(TARGET ${PROJECT_NAME}-test)
124-
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
125-
# endif()
126-
127-
## Add folders to be run by python nosetests
128-
# catkin_add_nosetests(test)
11+
install(DIRECTORY launch
12+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

‎rrbot_description/CMakeLists.txt

+7-120
Original file line numberDiff line numberDiff line change
@@ -1,128 +1,15 @@
11
cmake_minimum_required(VERSION 2.8.3)
22
project(rrbot_description)
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

9-
## System dependencies are found with CMake's conventions
10-
# find_package(Boost REQUIRED COMPONENTS system)
6+
catkin_package()
117

8+
install(DIRECTORY launch
9+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
1210

13-
## Uncomment this if the package has a setup.py. This macro ensures
14-
## modules and global scripts declared therein get installed
15-
## See http://ros.org/doc/groovy/api/catkin/html/user_guide/setup_dot_py.html
16-
# catkin_python_setup()
11+
install(DIRECTORY meshes
12+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
1713

18-
#######################################
19-
## Declare ROS messages and services ##
20-
#######################################
21-
22-
## Generate messages in the 'msg' folder
23-
# add_message_files(
24-
# FILES
25-
# Message1.msg
26-
# Message2.msg
27-
# )
28-
29-
## Generate services in the 'srv' folder
30-
# add_service_files(
31-
# FILES
32-
# Service1.srv
33-
# Service2.srv
34-
# )
35-
36-
## Generate added messages and services with any dependencies listed here
37-
# generate_messages(
38-
# DEPENDENCIES
39-
# std_msgs # Or other packages containing msgs
40-
# )
41-
42-
###################################
43-
## catkin specific configuration ##
44-
###################################
45-
## The catkin_package macro generates cmake config files for your package
46-
## Declare things to be passed to dependent projects
47-
## LIBRARIES: libraries you create in this project that dependent projects also need
48-
## CATKIN_DEPENDS: catkin_packages dependent projects also need
49-
## DEPENDS: system dependencies of this project that dependent projects also need
50-
catkin_package(
51-
# INCLUDE_DIRS include
52-
# LIBRARIES rrbot_description
53-
# CATKIN_DEPENDS other_catkin_pkg
54-
# DEPENDS system_lib
55-
)
56-
57-
###########
58-
## Build ##
59-
###########
60-
61-
## Specify additional locations of header files
62-
## Your package locations should be listed before other locations
63-
# include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
64-
65-
## Declare a cpp library
66-
# add_library(rrbot_description
67-
# src/${PROJECT_NAME}/rrbot_description.cpp
68-
# )
69-
70-
## Declare a cpp executable
71-
# add_executable(rrbot_description_node src/rrbot_description_node.cpp)
72-
73-
## Add cmake target dependencies of the executable/library
74-
## as an example, message headers may need to be generated before nodes
75-
# add_dependencies(rrbot_description_node rrbot_description_generate_messages_cpp)
76-
77-
## Specify libraries to link a library or executable target against
78-
# target_link_libraries(rrbot_description_node
79-
# ${catkin_LIBRARIES}
80-
# )
81-
82-
#############
83-
## Install ##
84-
#############
85-
86-
# all install targets should use catkin DESTINATION variables
87-
# See http://ros.org/doc/groovy/api/catkin/html/adv_user_guide/variables.html
88-
89-
## Mark executable scripts (Python etc.) for installation
90-
## in contrast to setup.py, you can choose the destination
91-
# install(PROGRAMS
92-
# scripts/my_python_script
93-
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
94-
# )
95-
96-
## Mark executables and/or libraries for installation
97-
# install(TARGETS rrbot_description rrbot_description_node
98-
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
99-
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
100-
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
101-
# )
102-
103-
## Mark cpp header files for installation
104-
# install(DIRECTORY include/${PROJECT_NAME}/
105-
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
106-
# FILES_MATCHING PATTERN "*.h"
107-
# PATTERN ".svn" EXCLUDE
108-
# )
109-
110-
## Mark other files for installation (e.g. launch and bag files, etc.)
111-
# install(FILES
112-
# # myfile1
113-
# # myfile2
114-
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
115-
# )
116-
117-
#############
118-
## Testing ##
119-
#############
120-
121-
## Add gtest based cpp test target and link libraries
122-
# catkin_add_gtest(${PROJECT_NAME}-test test/test_rrbot_description.cpp)
123-
# if(TARGET ${PROJECT_NAME}-test)
124-
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
125-
# endif()
126-
127-
## Add folders to be run by python nosetests
128-
# catkin_add_nosetests(test)
14+
install(DIRECTORY urdf
15+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

‎rrbot_description/urdf/libpeerconnection.log

Whitespace-only changes.

‎rrbot_gazebo/CMakeLists.txt

+8-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,12 @@
1-
# http://ros.org/doc/groovy/api/catkin/html/user_guide/supposed.html
21
cmake_minimum_required(VERSION 2.8.3)
32
project(rrbot_gazebo)
4-
# Load catkin and all dependencies required for this package
5-
# TODO: remove all from COMPONENTS that are not catkin packages.
6-
find_package(catkin REQUIRED COMPONENTS gazebo_ros)
73

4+
find_package(catkin REQUIRED)
85

9-
# TODO: fill in what other packages will need to use this package
10-
## DEPENDS: system dependencies of this project that dependent projects also need
11-
## CATKIN_DEPENDS: catkin_packages dependent projects also need
12-
## INCLUDE_DIRS:
13-
## LIBRARIES: libraries you create in this project that dependent projects also need
14-
catkin_package(
15-
DEPENDS
16-
CATKIN_DEPENDS # TODO
17-
INCLUDE_DIRS # TODO include
18-
LIBRARIES # TODO
19-
)
6+
catkin_package()
7+
8+
install(DIRECTORY launch
9+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
10+
11+
install(DIRECTORY worlds
12+
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

0 commit comments

Comments
 (0)