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

Remove unnecessary dependency on Cartographer. (#284)

master
Holger Rapp 2017-03-24 17:44:33 +01:00 committed by GitHub
parent 8b3af77fde
commit 69810c8920
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile.indigo
View File

@ -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/install.sh cartographer_ros/scripts/
COPY scripts/catkin_test_results.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/ COPY cartographer_ros_msgs catkin_ws/src/cartographer_ros/cartographer_ros_msgs/
RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs && \ RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs && \
cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs \ cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs \
--catkin-make-args run_tests && \ --catkin-make-args run_tests && \
cartographer_ros/scripts/catkin_test_results.sh build_isolated/cartographer_ros_msgs 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/ COPY cartographer_ros catkin_ws/src/cartographer_ros/cartographer_ros/
RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros && \ RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros && \
cartographer_ros/scripts/install.sh --pkg cartographer_ros \ cartographer_ros/scripts/install.sh --pkg cartographer_ros \

10
Dockerfile.kinetic
View File

@ -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/install.sh cartographer_ros/scripts/
COPY scripts/catkin_test_results.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/ COPY cartographer_ros_msgs catkin_ws/src/cartographer_ros/cartographer_ros_msgs/
RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs && \ RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs && \
cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs \ cartographer_ros/scripts/install.sh --pkg cartographer_ros_msgs \
--catkin-make-args run_tests && \ --catkin-make-args run_tests && \
cartographer_ros/scripts/catkin_test_results.sh build_isolated/cartographer_ros_msgs 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/ COPY cartographer_ros catkin_ws/src/cartographer_ros/cartographer_ros/
RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros && \ RUN cartographer_ros/scripts/install.sh --pkg cartographer_ros && \
cartographer_ros/scripts/install.sh --pkg cartographer_ros \ cartographer_ros/scripts/install.sh --pkg cartographer_ros \

4
cartographer_ros_msgs/CMakeLists.txt
View File

@ -20,10 +20,6 @@ set(PACKAGE_DEPENDENCIES
geometry_msgs 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}) find_package(catkin REQUIRED COMPONENTS message_generation ${PACKAGE_DEPENDENCIES})
add_message_files( add_message_files(

1
cartographer_ros_msgs/package.xml
View File

@ -30,7 +30,6 @@
<buildtool_depend>catkin</buildtool_depend> <buildtool_depend>catkin</buildtool_depend>
<depend>cartographer</depend>
<depend>geometry_msgs</depend> <depend>geometry_msgs</depend>
<build_depend>message_generation</build_depend> <build_depend>message_generation</build_depend>