Skip to content

Commit ade7605

Browse files
authored
Use installed Abseil. (cartographer-project#1570)
1 parent a5aa03b commit ade7605

9 files changed

+59
-98
lines changed

CMakeLists.txt

+15-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ include("${PROJECT_SOURCE_DIR}/cmake/functions.cmake")
2929
google_initialize_cartographer_project()
3030
google_enable_testing()
3131

32-
find_package(Abseil REQUIRED)
32+
find_package(absl REQUIRED)
3333
set(BOOST_COMPONENTS iostreams)
3434
if(WIN32)
3535
list(APPEND BOOST_COMPONENTS zlib)
@@ -268,7 +268,20 @@ target_include_directories(${PROJECT_NAME} SYSTEM PUBLIC
268268
${PROTOBUF_INCLUDE_DIR})
269269
# TODO(hrapp): This should not explicitly list pthread and use
270270
# PROTOBUF_LIBRARIES, but that failed on first try.
271-
target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY} standalone_absl)
271+
target_link_libraries(${PROJECT_NAME} PUBLIC ${PROTOBUF_LIBRARY}
272+
absl::algorithm
273+
absl::base
274+
absl::debugging
275+
absl::flat_hash_map
276+
absl::memory
277+
absl::meta
278+
absl::numeric
279+
absl::str_format
280+
absl::strings
281+
absl::synchronization
282+
absl::time
283+
absl::utility
284+
)
272285
if (NOT WIN32)
273286
target_link_libraries(${PROJECT_NAME} PUBLIC pthread)
274287
endif()

Dockerfile.bionic

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ RUN apt-get update && apt-get install -y sudo apt-utils tzdata && rm -rf /var/li
2828

2929
COPY scripts/install_debs_cmake.sh cartographer/scripts/
3030
RUN cartographer/scripts/install_debs_cmake.sh && rm -rf /var/lib/apt/lists/*
31+
COPY scripts/install_abseil.sh cartographer/scripts/
32+
RUN cartographer/scripts/install_abseil.sh && rm -rf /var/lib/apt/lists/*
3133
COPY scripts/install_proto3.sh cartographer/scripts/
3234
RUN cartographer/scripts/install_proto3.sh && rm -rf protobuf
3335
COPY scripts/install_grpc.sh cartographer/scripts/

Dockerfile.focal

+2
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,7 @@ RUN apt-get update && apt-get install -y sudo apt-utils tzdata && rm -rf /var/li
2828

2929
COPY scripts/install_debs_cmake.sh cartographer/scripts/
3030
RUN cartographer/scripts/install_debs_cmake.sh && rm -rf /var/lib/apt/lists/*
31+
COPY scripts/install_abseil.sh cartographer/scripts/
32+
RUN cartographer/scripts/install_abseil.sh && rm -rf /var/lib/apt/lists/*
3133
COPY . cartographer
3234
RUN cartographer/scripts/install_cartographer_cmake.sh && rm -rf cartographer

Dockerfile.jessie

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*
2626

2727
COPY scripts/install_debs_cmake.sh cartographer/scripts/
2828
RUN cartographer/scripts/install_debs_cmake.sh && rm -rf /var/lib/apt/lists/*
29+
COPY scripts/install_abseil.sh cartographer/scripts/
30+
RUN cartographer/scripts/install_abseil.sh && rm -rf /var/lib/apt/lists/*
2931
COPY scripts/install_ceres.sh cartographer/scripts/
3032
RUN cartographer/scripts/install_ceres.sh && rm -rf ceres-solver
3133
COPY scripts/install_proto3.sh cartographer/scripts/

Dockerfile.stretch

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*
2626

2727
COPY scripts/install_debs_cmake.sh cartographer/scripts/
2828
RUN cartographer/scripts/install_debs_cmake.sh && rm -rf /var/lib/apt/lists/*
29+
COPY scripts/install_abseil.sh cartographer/scripts/
30+
RUN cartographer/scripts/install_abseil.sh && rm -rf /var/lib/apt/lists/*
2931
COPY scripts/install_ceres.sh cartographer/scripts/
3032
RUN cartographer/scripts/install_ceres.sh && rm -rf ceres-solver
3133
COPY scripts/install_proto3.sh cartographer/scripts/

Dockerfile.xenial

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ RUN apt-get update && apt-get install -y sudo && rm -rf /var/lib/apt/lists/*
2727

2828
COPY scripts/install_debs_cmake.sh cartographer/scripts/
2929
RUN cartographer/scripts/install_debs_cmake.sh && rm -rf /var/lib/apt/lists/*
30+
COPY scripts/install_abseil.sh cartographer/scripts/
31+
RUN cartographer/scripts/install_abseil.sh && rm -rf /var/lib/apt/lists/*
3032
COPY scripts/install_ceres.sh cartographer/scripts/
3133
RUN cartographer/scripts/install_ceres.sh && rm -rf ceres-solver
3234
COPY scripts/install_proto3.sh cartographer/scripts/

cmake/modules/FindAbseil.cmake

-95
This file was deleted.

scripts/install_abseil.sh

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/sh
2+
3+
# Copyright 2019 The Cartographer Authors
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -o errexit
18+
set -o verbose
19+
20+
git clone https://github.com/abseil/abseil-cpp.git
21+
cd abseil-cpp
22+
git checkout d902eb869bcfacc1bad14933ed9af4bed006d481
23+
mkdir build
24+
cd build
25+
cmake -G Ninja \
26+
-DCMAKE_BUILD_TYPE=Release \
27+
-DCMAKE_INSTALL_PREFIX=/usr/local/stow/absl \
28+
..
29+
ninja
30+
sudo ninja install
31+
cd /usr/local/stow
32+
sudo stow absl

scripts/install_debs_cmake.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ sudo apt-get install -y \
4545
libgoogle-glog-dev \
4646
liblua5.2-dev \
4747
libsuitesparse-dev \
48-
ninja-build
48+
ninja-build \
49+
stow
4950

5051
if [[ "$(lsb_release -sc)" = "focal" ]]
5152
then

0 commit comments

Comments
 (0)