12345qiupeng
/
cartographer_ros
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes wstool invocation to match wstool docs. (#71) 

* Simplifies CMake installation configuration.
master
Damon Kohler 2016-09-28 14:36:22 +02:00 committed by GitHub
parent 0e15fb9a87
commit 337607692a
5 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cartographer_ros.rosinstall
View File

@ -1,2 +1,2 @@
- git: {local-name: src/cartographer, uri: 'https://github.com/googlecartographer/cartographer.git'} - git: {local-name: cartographer, uri: 'https://github.com/googlecartographer/cartographer.git'}
- git: {local-name: src/cartographer_ros, uri: 'https://github.com/googlecartographer/cartographer_ros.git'} - git: {local-name: cartographer_ros, uri: 'https://github.com/googlecartographer/cartographer_ros.git'}

12
cartographer_ros/CMakeLists.txt
View File

@ -114,16 +114,8 @@ add_dependencies(time_conversion_test
${catkin_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS}
) )
install(DIRECTORY launch/ install(DIRECTORY launch urdf configuration_files
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch/ DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)
install(DIRECTORY urdf/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/urdf/
)
install(DIRECTORY configuration_files/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/configuration_files/
) )
install(TARGETS cartographer_node install(TARGETS cartographer_node

4
cartographer_rviz/CMakeLists.txt
View File

@ -105,6 +105,6 @@ install(FILES rviz_plugin_description.xml
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
) )
install(DIRECTORY ogre_media/ install(DIRECTORY ogre_media
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/ogre_media DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
) )

8
docs/source/index.rst
View File

@ -49,11 +49,11 @@ using `Ninja <https://ninja-build.org>`_.
# Create a new workspace in 'catkin_ws'. # Create a new workspace in 'catkin_ws'.
mkdir catkin_ws mkdir catkin_ws
cd catkin_ws cd catkin_ws
wstool init wstool init src
# Merge the cartographer_ros rosinstall file and fetch code for dependencies. # Merge the cartographer_ros.rosinstall file and fetch code for dependencies.
wstool merge https://raw.githubusercontent.com/googlecartographer/cartographer_ros/master/cartographer_ros.rosinstall wstool merge -t src https://raw.githubusercontent.com/googlecartographer/cartographer_ros/master/cartographer_ros.rosinstall
wstool update wstool update -t src
# Install deb dependencies. # Install deb dependencies.
rosdep update rosdep update

8
scripts/install.sh
View File

@ -26,11 +26,11 @@ sudo apt-get install -y ninja-build
# Create a new workspace in 'catkin_ws'. # Create a new workspace in 'catkin_ws'.
mkdir catkin_ws mkdir catkin_ws
cd catkin_ws cd catkin_ws
wstool init wstool init src
# Merge the cartographer_ros rosinstall file and fetch code for dependencies. # Merge the cartographer_ros.rosinstall file and fetch code for dependencies.
wstool merge ../cartographer_ros/cartographer_ros.rosinstall wstool merge -t src ../cartographer_ros/cartographer_ros.rosinstall
wstool update wstool update -t src
# Use the local version of cartographer_ros to include local modifications. # Use the local version of cartographer_ros to include local modifications.
rm -rf src/cartographer_ros rm -rf src/cartographer_ros