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

Fix build error on Ubuntu 20.04 + ROS Noetic/Melodic (#1745) 

* Fix build error on Ubuntu 20.04 + ROS Noetic

Signed-off-by: Daisuke Sato <tiryoh@gmail.com>
master
Daisuke Sato 2022-09-20 22:10:53 +09:00 committed by GitHub
parent a727ea8f6c
commit 741beb64ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile.melodic
View File

@ -32,7 +32,8 @@ ADD https://api.github.com/repos/cartographer-project/cartographer/git/refs/head
COPY cartographer_ros.rosinstall cartographer_ros/ COPY cartographer_ros.rosinstall cartographer_ros/
COPY scripts/prepare_catkin_workspace.sh cartographer_ros/scripts/ COPY scripts/prepare_catkin_workspace.sh cartographer_ros/scripts/
RUN CARTOGRAPHER_VERSION=$CARTOGRAPHER_VERSION \ RUN CARTOGRAPHER_VERSION=$CARTOGRAPHER_VERSION \
cartographer_ros/scripts/prepare_catkin_workspace.sh cartographer_ros/scripts/prepare_catkin_workspace.sh && \
sed -i -e "s%<depend>libabsl-dev</depend>%<\!--<depend>libabsl-dev</depend>-->%g" catkin_ws/src/cartographer/package.xml
# rosdep needs the updated package.xml files to install the correct debs. # rosdep needs the updated package.xml files to install the correct debs.
COPY cartographer_ros/package.xml catkin_ws/src/cartographer_ros/cartographer_ros/ COPY cartographer_ros/package.xml catkin_ws/src/cartographer_ros/cartographer_ros/

3
Dockerfile.noetic
View File

@ -36,7 +36,8 @@ ADD https://api.github.com/repos/cartographer-project/cartographer/git/refs/head
COPY cartographer_ros.rosinstall cartographer_ros/ COPY cartographer_ros.rosinstall cartographer_ros/
COPY scripts/prepare_catkin_workspace.sh cartographer_ros/scripts/ COPY scripts/prepare_catkin_workspace.sh cartographer_ros/scripts/
RUN CARTOGRAPHER_VERSION=$CARTOGRAPHER_VERSION \ RUN CARTOGRAPHER_VERSION=$CARTOGRAPHER_VERSION \
cartographer_ros/scripts/prepare_catkin_workspace.sh cartographer_ros/scripts/prepare_catkin_workspace.sh && \
sed -i -e "s%<depend>libabsl-dev</depend>%<\!--<depend>libabsl-dev</depend>-->%g" catkin_ws/src/cartographer/package.xml
# rosdep needs the updated package.xml files to install the correct debs. # rosdep needs the updated package.xml files to install the correct debs.
COPY cartographer_ros/package.xml catkin_ws/src/cartographer_ros/cartographer_ros/ COPY cartographer_ros/package.xml catkin_ws/src/cartographer_ros/cartographer_ros/