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

* Simplifies CMake installation configuration.

cartographer_turtlebot.rosinstall

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

cartographer_turtlebot/CMakeLists.txt

@@ -47,17 +47,12 @@ add_executable(flat_world_imu_node src/flat_world_imu_node_main.cc)
 target_link_libraries(flat_world_imu_node ${catkin_LIBRARIES})
 add_dependencies(flat_world_imu_node ${catkin_EXPORTED_TARGETS})
 
-install(TARGETS
-  flat_world_imu_node
+install(TARGETS flat_world_imu_node
   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
-install(DIRECTORY launch/
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch/
-)
-
-install(DIRECTORY configuration_files/
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/configuration_files/
+install(DIRECTORY launch configuration_files
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )

docs/source/index.rst

@@ -48,11 +48,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_turtlebot/master/cartographer_turtlebot.rosinstall
-    wstool update
+    # Merge the cartographer_turtlebot.rosinstall file and fetch code for dependencies.
+    wstool merge -t src https://raw.githubusercontent.com/googlecartographer/cartographer_turtlebot/master/cartographer_turtlebot.rosinstall
+    wstool update -t src
 
     # Install deb dependencies.
     rosdep update

scripts/install.bash

@@ -24,8 +24,8 @@ source /ros_entrypoint.sh
 # Create a new workspace in 'catkin_ws'.
 mkdir catkin_ws
 cd catkin_ws
-catkin_init_workspace
-mkdir src
+wstool init src
+
 mv ../cartographer_turtlebot src
 
 # Install rosdep dependencies.