-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #12 from CIR-KIT-Unit03/mm/fix/dependency/third_robot
Fix dependency to third_robot_navigation_gazebo
- Loading branch information
Showing
10 changed files
with
36 additions
and
239 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,160 +1,3 @@ | ||
| cmake_minimum_required(VERSION 2.8.3) | ||
| project(cirkit_unit03_navigation_gazebo) | ||
|
|
||
| ## Find catkin macros and libraries | ||
| ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) | ||
| ## is used, also find other catkin packages | ||
| #find_package(catkin REQUIRED roslaunch) | ||
| find_package(catkin REQUIRED COMPONENTS) | ||
|
|
||
| ## System dependencies are found with CMake's conventions | ||
| # find_package(Boost REQUIRED COMPONENTS system) | ||
|
|
||
|
|
||
| ## Uncomment this if the package has a setup.py. This macro ensures | ||
| ## modules and global scripts declared therein get installed | ||
| ## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html | ||
| # catkin_python_setup() | ||
|
|
||
| ################################################ | ||
| ## Declare ROS messages, services and actions ## | ||
| ################################################ | ||
|
|
||
| ## To declare and build messages, services or actions from within this | ||
| ## package, follow these steps: | ||
| ## * Let MSG_DEP_SET be the set of packages whose message types you use in | ||
| ## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...). | ||
| ## * In the file package.xml: | ||
| ## * add a build_depend and a run_depend tag for each package in MSG_DEP_SET | ||
| ## * If MSG_DEP_SET isn't empty the following dependencies might have been | ||
| ## pulled in transitively but can be declared for certainty nonetheless: | ||
| ## * add a build_depend tag for "message_generation" | ||
| ## * add a run_depend tag for "message_runtime" | ||
| ## * In this file (CMakeLists.txt): | ||
| ## * add "message_generation" and every package in MSG_DEP_SET to | ||
| ## find_package(catkin REQUIRED COMPONENTS ...) | ||
| ## * add "message_runtime" and every package in MSG_DEP_SET to | ||
| ## catkin_package(CATKIN_DEPENDS ...) | ||
| ## * uncomment the add_*_files sections below as needed | ||
| ## and list every .msg/.srv/.action file to be processed | ||
| ## * uncomment the generate_messages entry below | ||
| ## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...) | ||
|
|
||
| ## Generate messages in the 'msg' folder | ||
| # add_message_files( | ||
| # FILES | ||
| # Message1.msg | ||
| # Message2.msg | ||
| # ) | ||
|
|
||
| ## Generate services in the 'srv' folder | ||
| # add_service_files( | ||
| # FILES | ||
| # Service1.srv | ||
| # Service2.srv | ||
| # ) | ||
|
|
||
| ## Generate actions in the 'action' folder | ||
| # add_action_files( | ||
| # FILES | ||
| # Action1.action | ||
| # Action2.action | ||
| # ) | ||
|
|
||
| ## Generate added messages and services with any dependencies listed here | ||
| # generate_messages( | ||
| # DEPENDENCIES | ||
| # std_msgs # Or other packages containing msgs | ||
| # ) | ||
|
|
||
| ################################### | ||
| ## catkin specific configuration ## | ||
| ################################### | ||
| ## The catkin_package macro generates cmake config files for your package | ||
| ## Declare things to be passed to dependent projects | ||
| ## INCLUDE_DIRS: uncomment this if you package contains header files | ||
| ## LIBRARIES: libraries you create in this project that dependent projects also need | ||
| ## CATKIN_DEPENDS: catkin_packages dependent projects also need | ||
| ## DEPENDS: system dependencies of this project that dependent projects also need | ||
| catkin_package( | ||
| # INCLUDE_DIRS include | ||
| # LIBRARIES third_robot_2dnav | ||
| # CATKIN_DEPENDS offset_urg_tf third_robot_driver | ||
| # DEPENDS system_lib | ||
| ) | ||
|
|
||
| ########### | ||
| ## Build ## | ||
| ########### | ||
|
|
||
| ## Specify additional locations of header files | ||
| ## Your package locations should be listed before other locations | ||
| # include_directories(include) | ||
| #include_directories( | ||
| # ${catkin_INCLUDE_DIRS} | ||
| #) | ||
|
|
||
| ## Declare a cpp library | ||
| # add_library(third_robot_2dnav | ||
| # src/${PROJECT_NAME}/third_robot_2dnav.cpp | ||
| # ) | ||
|
|
||
| ## Declare a cpp executable | ||
| # add_executable(third_robot_2dnav_node src/third_robot_2dnav_node.cpp) | ||
|
|
||
| ## Add cmake target dependencies of the executable/library | ||
| ## as an example, message headers may need to be generated before nodes | ||
| # add_dependencies(third_robot_2dnav_node third_robot_2dnav_generate_messages_cpp) | ||
|
|
||
| ## Specify libraries to link a library or executable target against | ||
| # target_link_libraries(third_robot_2dnav_node | ||
| # ${catkin_LIBRARIES} | ||
| # ) | ||
|
|
||
| ############# | ||
| ## Install ## | ||
| ############# | ||
|
|
||
| # all install targets should use catkin DESTINATION variables | ||
| # See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html | ||
|
|
||
| ## Mark executable scripts (Python etc.) for installation | ||
| ## in contrast to setup.py, you can choose the destination | ||
| # install(PROGRAMS | ||
| # scripts/my_python_script | ||
| # DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} | ||
| # ) | ||
|
|
||
| ## Mark executables and/or libraries for installation | ||
| # install(TARGETS third_robot_2dnav third_robot_2dnav_node | ||
| # ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} | ||
| # LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} | ||
| # RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} | ||
| # ) | ||
|
|
||
| ## Mark cpp header files for installation | ||
| # install(DIRECTORY include/${PROJECT_NAME}/ | ||
| # DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} | ||
| # FILES_MATCHING PATTERN "*.h" | ||
| # PATTERN ".svn" EXCLUDE | ||
| # ) | ||
|
|
||
| ## Mark other files for installation (e.g. launch and bag files, etc.) | ||
| # install(FILES | ||
| # # myfile1 | ||
| # # myfile2 | ||
| # DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} | ||
| # ) | ||
|
|
||
| ############# | ||
| ## Testing ## | ||
| ############# | ||
|
|
||
| ## Add gtest based cpp test target and link libraries | ||
| # catkin_add_gtest(${PROJECT_NAME}-test test/test_third_robot_2dnav.cpp) | ||
| # if(TARGET ${PROJECT_NAME}-test) | ||
| # target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) | ||
| # endif() | ||
|
|
||
| ## Add folders to be run by python nosetests | ||
| # catkin_add_nosetests(test) | ||
| find_package(catkin REQUIRED) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
cirkit_unit03_navigation_gazebo/config/costmap_common_params.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 2 additions & 5 deletions
7
cirkit_unit03_navigation_gazebo/launch/waypoint_generator.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,67 +1,25 @@ | ||
| <?xml version="1.0"?> | ||
| <package> | ||
| <package format="2"> | ||
| <name>cirkit_unit03_navigation_gazebo</name> | ||
| <version>0.1.0</version> | ||
| <description>The cirkit_unit03_navigation for gazebo package</description> | ||
|
|
||
| <!-- One maintainer tag required, multiple allowed, one person per tag --> | ||
| <!-- Example: --> | ||
| <maintainer email="[email protected]">Masaru Morita</maintainer> | ||
|
|
||
|
|
||
| <!-- One license tag required, multiple allowed, one license per tag --> | ||
| <!-- Commonly used license strings: --> | ||
| <!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 --> | ||
| <license>BSD</license> | ||
| <url type="reposigory">https://github.com/CIR-KIT-Unit03/cirkit_unit03.git</url> | ||
| <url type="bugtracker">https://github.com/CIR-KIT-Unit03/cirkit_unit03/issues</url> | ||
| <author email="[email protected]">CIR-KIT</author> | ||
|
|
||
|
|
||
| <!-- Url tags are optional, but mutiple are allowed, one per tag --> | ||
| <!-- Optional attribute type can be: website, bugtracker, or repository --> | ||
| <!-- Example: --> | ||
| <!-- <url type="website">http://wiki.ros.org/third_robot_2dnav</url> --> | ||
|
|
||
|
|
||
| <!-- Author tags are optional, mutiple are allowed, one per tag --> | ||
| <!-- Authors do not have to be maintianers, but could be --> | ||
| <!-- Example: --> | ||
| <!-- <author email="[email protected]">Jane Doe</author> --> | ||
|
|
||
|
|
||
| <!-- The *_depend tags are used to specify dependencies --> | ||
| <!-- Dependencies can be catkin packages or system dependencies --> | ||
| <!-- Examples: --> | ||
| <!-- Use build_depend for packages you need at compile time: --> | ||
| <!-- <build_depend>message_generation</build_depend> --> | ||
| <!-- Use buildtool_depend for build tool packages: --> | ||
| <!-- <buildtool_depend>catkin</buildtool_depend> --> | ||
| <!-- Use run_depend for packages you need at runtime: --> | ||
| <!-- <run_depend>message_runtime</run_depend> --> | ||
| <!-- Use test_depend for packages you need only for testing: --> | ||
| <!-- <test_depend>gtest</test_depend> --> | ||
| <!-- | ||
| <buildtool_depend>catkin</buildtool_depend> | ||
| <build_depend>offset_urg_tf</build_depend> | ||
| <build_depend>third_robot_driver</build_depend> | ||
| <run_depend>offset_urg_tf</run_depend> | ||
| <run_depend>third_robot_driver</run_depend> | ||
| --> | ||
| <buildtool_depend>catkin</buildtool_depend> | ||
| <build_depend>roslaunch</build_depend> | ||
| <run_depend>amcl</run_depend> | ||
| <run_depend>frontier_exploration</run_depend> | ||
| <run_depend>gmapping</run_depend> | ||
| <run_depend>map_server</run_depend> | ||
| <run_depend>move_base</run_depend> | ||
| <run_depend>navfn</run_depend> | ||
| <run_depend>base_local_planner</run_depend> | ||
| <run_depend>dwa_local_planner</run_depend> | ||
| <exec_depend>amcl</exec_depend> | ||
| <exec_depend>base_local_planner</exec_depend> | ||
| <exec_depend>dwa_local_planner</exec_depend> | ||
| <exec_depend>frontier_exploration</exec_depend> | ||
| <exec_depend>gmapping</exec_depend> | ||
| <exec_depend>map_server</exec_depend> | ||
| <exec_depend>move_base</exec_depend> | ||
| <exec_depend>navfn</exec_depend> | ||
|
|
||
| <!-- The export tag contains other, unspecified, tags --> | ||
| <export> | ||
| <!-- You can specify that this package is a metapackage here: --> | ||
| <!-- <metapackage/> --> | ||
|
|
||
| <!-- Other tools can request additional information be placed here --> | ||
|
|
||
| </export> | ||
| </package> |