From e5894cce1f8047d5c807158711e468b3f5550f1a Mon Sep 17 00:00:00 2001 From: Wolfgang Hess Date: Thu, 25 Jun 2020 09:35:57 +0200 Subject: [PATCH] Small Abseil fixes for dependents. (#1711) Enable PIC so that shared libraries can use the Cartographer library. Fixes the config so that dependent builds can find Abseil. Signed-off-by: Wolfgang Hess --- cartographer-config.cmake.in | 2 +- docs/source/index.rst | 4 ++++ scripts/install_abseil.sh | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cartographer-config.cmake.in b/cartographer-config.cmake.in index 1986207..98193da 100644 --- a/cartographer-config.cmake.in +++ b/cartographer-config.cmake.in @@ -39,7 +39,7 @@ find_package(Ceres ${QUIET_OR_REQUIRED_OPTION} HINTS ${CERES_DIR_HINTS}) if (WIN32) find_package(glog REQUIRED) endif() -find_package(Abseil ${QUIET_OR_REQUIRED_OPTION}) +find_package(absl ${QUIET_OR_REQUIRED_OPTION}) if(CARTOGRAPHER_HAS_GRPC) find_package(async_grpc ${QUIET_OR_REQUIRED_OPTION}) endif() diff --git a/docs/source/index.rst b/docs/source/index.rst index bdb8621..8de158a 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -71,6 +71,10 @@ On Ubuntu 16.04 (Xenial): :language: bash :lines: 20- +.. literalinclude:: ../../scripts/install_abseil.sh + :language: bash + :lines: 20- + .. literalinclude:: ../../scripts/install_ceres.sh :language: bash :lines: 20- diff --git a/scripts/install_abseil.sh b/scripts/install_abseil.sh index f7aafb0..4962d6e 100755 --- a/scripts/install_abseil.sh +++ b/scripts/install_abseil.sh @@ -24,6 +24,7 @@ mkdir build cd build cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_INSTALL_PREFIX=/usr/local/stow/absl \ .. ninja