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

* Simplifies CMake installation configuration.

cartographer_ros.rosinstall

@@ -1,2 +1,2 @@
-- git: {local-name: src/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, uri: 'https://github.com/googlecartographer/cartographer.git'}
+- git: {local-name: cartographer_ros, uri: 'https://github.com/googlecartographer/cartographer_ros.git'}

cartographer_ros/CMakeLists.txt

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

cartographer_rviz/CMakeLists.txt

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

docs/source/index.rst

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

scripts/install.sh

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