-
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.
- Loading branch information
1 parent
594dbf4
commit 7fd03d0
Showing
7 changed files
with
8 additions
and
215 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
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,61 +1,8 @@ | ||
| # Catkin User Guide: http://www.ros.org/doc/groovy/api/catkin/html/user_guide/user_guide.html | ||
| # Catkin CMake Standard: http://www.ros.org/doc/groovy/api/catkin/html/user_guide/standards.html | ||
| cmake_minimum_required(VERSION 2.8.3) | ||
| project(pr2_2dnav_local) | ||
| # Load catkin and all dependencies required for this package | ||
| # TODO: remove all from COMPONENTS that are not catkin packages. | ||
| find_package(catkin REQUIRED COMPONENTS pr2_navigation_perception pr2_navigation_local pr2_navigation_teleop pr2_machine) | ||
|
|
||
| # include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS}) | ||
| # CATKIN_MIGRATION: removed during catkin migration | ||
| # cmake_minimum_required(VERSION 2.4.6) | ||
|
|
||
| # CATKIN_MIGRATION: removed during catkin migration | ||
| # include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) | ||
|
|
||
| # Set the build type. Options are: | ||
| # Coverage : w/ debug symbols, w/o optimization, w/ code-coverage | ||
| # Debug : w/ debug symbols, w/o optimization | ||
| # Release : w/o debug symbols, w/ optimization | ||
| # RelWithDebInfo : w/ debug symbols, w/ optimization | ||
| # MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries | ||
| #set(ROS_BUILD_TYPE RelWithDebInfo) | ||
|
|
||
|
|
||
| # CATKIN_MIGRATION: removed during catkin migration | ||
| # rosbuild_init() | ||
|
|
||
| #set the default path for built executables to the "bin" directory | ||
| set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) | ||
| #set the default path for built libraries to the "lib" directory | ||
| set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) | ||
|
|
||
| #uncomment if you have defined messages | ||
| #add_message_files( | ||
|
|
||
| #common commands for building c++ executables and libraries | ||
| #add_library(${PROJECT_NAME} src/example.cpp) | ||
| #target_link_libraries(${PROJECT_NAME} another_library) | ||
| # | ||
| # CATKIN_MIGRATION: removed during catkin migration | ||
| # rosbuild_add_boost_directories() | ||
| #find_package(Boost REQUIRED COMPONENTS thread) | ||
| include_directories(${Boost_INCLUDE_DIRS}) | ||
| #add_executable(example examples/example.cpp) | ||
| #target_link_libraries(example ${PROJECT_NAME}) | ||
| ## Generate added messages and services with any dependencies listed here | ||
| generate_messages( | ||
| #TODO DEPENDENCIES geometry_msgs std_msgs | ||
| ) | ||
|
|
||
| # catkin_package parameters: http://ros.org/doc/groovy/api/catkin/html/dev_guide/generated_cmake_api.html#catkin-package | ||
| # TODO: fill in what other packages will need to use this package | ||
| catkin_package( | ||
| DEPENDS pr2_navigation_perception pr2_navigation_local pr2_navigation_teleop pr2_machine | ||
| CATKIN_DEPENDS # TODO | ||
| INCLUDE_DIRS # TODO include | ||
| LIBRARIES # TODO | ||
| CATKIN_DEPENDS pr2_navigation_perception pr2_navigation_local pr2_navigation_teleop pr2_machine | ||
| ) | ||
|
|
||
| install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) | ||
|
|
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,61 +1,8 @@ | ||
| # Catkin User Guide: http://www.ros.org/doc/groovy/api/catkin/html/user_guide/user_guide.html | ||
| # Catkin CMake Standard: http://www.ros.org/doc/groovy/api/catkin/html/user_guide/standards.html | ||
| cmake_minimum_required(VERSION 2.8.3) | ||
| project(pr2_2dnav_slam) | ||
| # Load catkin and all dependencies required for this package | ||
| # TODO: remove all from COMPONENTS that are not catkin packages. | ||
| find_package(catkin REQUIRED COMPONENTS pr2_navigation_slam pr2_navigation_perception pr2_navigation_teleop pr2_machine) | ||
|
|
||
| # include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS}) | ||
| # CATKIN_MIGRATION: removed during catkin migration | ||
| # cmake_minimum_required(VERSION 2.4.6) | ||
|
|
||
| # CATKIN_MIGRATION: removed during catkin migration | ||
| # include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake) | ||
|
|
||
| # Set the build type. Options are: | ||
| # Coverage : w/ debug symbols, w/o optimization, w/ code-coverage | ||
| # Debug : w/ debug symbols, w/o optimization | ||
| # Release : w/o debug symbols, w/ optimization | ||
| # RelWithDebInfo : w/ debug symbols, w/ optimization | ||
| # MinSizeRel : w/o debug symbols, w/ optimization, stripped binaries | ||
| #set(ROS_BUILD_TYPE RelWithDebInfo) | ||
|
|
||
|
|
||
| # CATKIN_MIGRATION: removed during catkin migration | ||
| # rosbuild_init() | ||
|
|
||
| #set the default path for built executables to the "bin" directory | ||
| set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) | ||
| #set the default path for built libraries to the "lib" directory | ||
| set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) | ||
|
|
||
| #uncomment if you have defined messages | ||
| #add_message_files( | ||
|
|
||
| #common commands for building c++ executables and libraries | ||
| #add_library(${PROJECT_NAME} src/example.cpp) | ||
| #target_link_libraries(${PROJECT_NAME} another_library) | ||
| # | ||
| # CATKIN_MIGRATION: removed during catkin migration | ||
| # rosbuild_add_boost_directories() | ||
| #find_package(Boost REQUIRED COMPONENTS thread) | ||
| include_directories(${Boost_INCLUDE_DIRS}) | ||
| #add_executable(example examples/example.cpp) | ||
| #target_link_libraries(example ${PROJECT_NAME}) | ||
| ## Generate added messages and services with any dependencies listed here | ||
| generate_messages( | ||
| #TODO DEPENDENCIES geometry_msgs std_msgs | ||
| ) | ||
|
|
||
| # catkin_package parameters: http://ros.org/doc/groovy/api/catkin/html/dev_guide/generated_cmake_api.html#catkin-package | ||
| # TODO: fill in what other packages will need to use this package | ||
| catkin_package( | ||
| DEPENDS pr2_navigation_slam pr2_navigation_perception pr2_navigation_teleop pr2_machine | ||
| CATKIN_DEPENDS # TODO | ||
| INCLUDE_DIRS # TODO include | ||
| LIBRARIES # TODO | ||
| CATKIN_DEPENDS pr2_navigation_slam pr2_navigation_perception pr2_navigation_teleop pr2_machine | ||
| ) | ||
|
|
||
| install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) | ||
|
|
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 |
|---|---|---|
|
|
@@ -4,50 +4,16 @@ | |
| <version>1.0.2</version> | ||
| <description>The pr2_navigation_apps package</description> | ||
|
|
||
| <!-- One maintainer tag required, multiple allowed, one person per tag --> | ||
| <!-- Example: --> | ||
| <!-- <maintainer email="[email protected]">Jane Doe</maintainer> --> | ||
| <maintainer email="[email protected]">Devon Ash</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>TODO</license> | ||
|
|
||
|
|
||
| <!-- 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/pr2_navigation_apps</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> | ||
|
|
||
| <run_depend>pr2_2dnav</run_depend> | ||
| <run_depend>pr2_2dnav_local</run_depend> | ||
| <run_depend>pr2_2dnav_slam</run_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 --> | ||
|
|
||
| <metapackage/> | ||
| </export> | ||
| </package> | ||