From 69810c8920919cabbaa859ae2aa70f8b519536eb Mon Sep 17 00:00:00 2001
From: Holger Rapp <HolgerRapp@gmx.net>
Date: Fri, 24 Mar 2017 17:44:33 +0100
Subject: [PATCH] Remove unnecessary dependency on Cartographer. (#284)

---
 Dockerfile.indigo                    | 10 +++++-----
 Dockerfile.kinetic                   | 10 +++++-----
 cartographer_ros_msgs/CMakeLists.txt |  4 ----
 cartographer_ros_msgs/package.xml    |  1 -
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Dockerfile.indigo b/Dockerfile.indigo
index 320a895..06c40c7 100644
--- a/Dockerfile.indigo
+++ b/Dockerfile.indigo
@@ -41,17 +41,17 @@ RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
 COPY scripts/install.sh cartographer_ros/scripts/
 COPY scripts/catkin_test_results.sh cartographer_ros/scripts/
 
-RUN cartographer_ros/scripts/install.sh --pkg ceres-solver
-
-RUN cartographer_ros/scripts/install.sh --pkg cartographer && \
-    cartographer_ros/scripts/install.sh --pkg cartographer --make-args test
-
 COPY cartographer_ros_msgs catkin_ws/src/cartographer_ros/cartographer_ros_msgs/
 RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs && \
     cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs \
         --catkin-make-args run_tests && \
     cartographer_ros/scripts/catkin_test_results.sh build_isolated/cartographer_ros_msgs
 
+RUN cartographer_ros/scripts/install.sh --pkg ceres-solver
+
+RUN cartographer_ros/scripts/install.sh --pkg cartographer && \
+    cartographer_ros/scripts/install.sh --pkg cartographer --make-args test
+
 COPY cartographer_ros catkin_ws/src/cartographer_ros/cartographer_ros/
 RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros && \
     cartographer_ros/scripts/install.sh --pkg cartographer_ros \
diff --git a/Dockerfile.kinetic b/Dockerfile.kinetic
index 48ad092..51b0f78 100644
--- a/Dockerfile.kinetic
+++ b/Dockerfile.kinetic
@@ -44,17 +44,17 @@ RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*
 COPY scripts/install.sh cartographer_ros/scripts/
 COPY scripts/catkin_test_results.sh cartographer_ros/scripts/
 
-RUN cartographer_ros/scripts/install.sh --pkg ceres-solver
-
-RUN cartographer_ros/scripts/install.sh --pkg cartographer && \
-    cartographer_ros/scripts/install.sh --pkg cartographer --make-args test
-
 COPY cartographer_ros_msgs catkin_ws/src/cartographer_ros/cartographer_ros_msgs/
 RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs && \
     cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs \
         --catkin-make-args run_tests && \
     cartographer_ros/scripts/catkin_test_results.sh build_isolated/cartographer_ros_msgs
 
+RUN cartographer_ros/scripts/install.sh --pkg ceres-solver
+
+RUN cartographer_ros/scripts/install.sh --pkg cartographer && \
+    cartographer_ros/scripts/install.sh --pkg cartographer --make-args test
+
 COPY cartographer_ros catkin_ws/src/cartographer_ros/cartographer_ros/
 RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros && \
     cartographer_ros/scripts/install.sh --pkg cartographer_ros \
diff --git a/cartographer_ros_msgs/CMakeLists.txt b/cartographer_ros_msgs/CMakeLists.txt
index 2e02b61..2351e0d 100644
--- a/cartographer_ros_msgs/CMakeLists.txt
+++ b/cartographer_ros_msgs/CMakeLists.txt
@@ -20,10 +20,6 @@ set(PACKAGE_DEPENDENCIES
   geometry_msgs
 )
 
-find_package(cartographer REQUIRED)
-include("${CARTOGRAPHER_CMAKE_DIR}/functions.cmake")
-google_initialize_cartographer_project()
-
 find_package(catkin REQUIRED COMPONENTS message_generation ${PACKAGE_DEPENDENCIES})
 
 add_message_files(
diff --git a/cartographer_ros_msgs/package.xml b/cartographer_ros_msgs/package.xml
index 421282a..f58afc1 100644
--- a/cartographer_ros_msgs/package.xml
+++ b/cartographer_ros_msgs/package.xml
@@ -30,7 +30,6 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <depend>cartographer</depend>
   <depend>geometry_msgs</depend>
 
   <build_depend>message_generation</build_depend>