Skip to content

Commit

Permalink
Build Abseil dependency in CI. (cartographer-project#1485)
Browse files Browse the repository at this point in the history
cartographer-project/cartographer#1711 removed
building Abseil from the Cartographer library.
We follow here the same approach as in
cartographer CI.

An alternative approach which is now possible is
adding an Abseil package for catkin and depending
on that.

Signed-off-by: Wolfgang Hess <[email protected]>
  • Loading branch information
wohe authored Jun 25, 2020
1 parent bdf8f59 commit be4332b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 11 deletions.
3 changes: 2 additions & 1 deletion Dockerfile.kinetic
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ COPY cartographer_rviz/package.xml catkin_ws/src/cartographer_ros/cartographer_r
COPY scripts/install_debs.sh cartographer_ros/scripts/
RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*

# Install proto3.
# Install Abseil and proto3.
RUN /catkin_ws/src/cartographer/scripts/install_abseil.sh
RUN /catkin_ws/src/cartographer/scripts/install_proto3.sh

# Build, install, and test all packages individually to allow caching. The
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.melodic
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ COPY cartographer_rviz/package.xml catkin_ws/src/cartographer_ros/cartographer_r
COPY scripts/install_debs.sh cartographer_ros/scripts/
RUN cartographer_ros/scripts/install_debs.sh && rm -rf /var/lib/apt/lists/*

# Install proto3.
# Install Abseil and proto3.
RUN /catkin_ws/src/cartographer/scripts/install_abseil.sh
RUN /catkin_ws/src/cartographer/scripts/install_proto3.sh

# Build, install, and test all packages individually to allow caching. The
Expand Down
2 changes: 1 addition & 1 deletion cartographer_ros/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ find_package(catkin REQUIRED COMPONENTS ${PACKAGE_DEPENDENCIES})

include(FindPkgConfig)

find_package(Abseil REQUIRED)
find_package(absl REQUIRED)
find_package(LuaGoogle REQUIRED)
find_package(Eigen3 REQUIRED)

Expand Down
2 changes: 1 addition & 1 deletion cartographer_rviz/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ find_package(cartographer REQUIRED)
include("${CARTOGRAPHER_CMAKE_DIR}/functions.cmake")
google_initialize_cartographer_project()

find_package(Abseil REQUIRED)
find_package(absl REQUIRED)
find_package(Eigen3 REQUIRED)
find_package(catkin REQUIRED COMPONENTS ${PACKAGE_DEPENDENCIES})

Expand Down
11 changes: 4 additions & 7 deletions scripts/install_debs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,10 @@
set -o errexit
set -o verbose

# Install CMake 3.2 for Ubuntu Trusty and Debian Jessie.
# Install CMake 3.2 for Debian Jessie.
sudo apt-get update
sudo apt-get install lsb-release -y
if [[ "$(lsb_release -sc)" = "trusty" ]]
then
sudo apt-get install cmake3 -y
elif [[ "$(lsb_release -sc)" = "jessie" ]]
if [[ "$(lsb_release -sc)" = "jessie" ]]
then
sudo sh -c "echo 'deb http://ftp.debian.org/debian jessie-backports main' >> /etc/apt/sources.list"
sudo apt-get update
Expand All @@ -36,9 +33,9 @@ fi

cd catkin_ws

# Install Ninja.
# Install Ninja and stow.
apt-get update
apt-get install -y ninja-build
apt-get install -y ninja-build stow

# Install rosdep dependencies.
rosdep update
Expand Down

0 comments on commit be4332b

Please sign in to comment.