From 2ebf4d0d39aef428bca24e8608018d1a286c7aac Mon Sep 17 00:00:00 2001 From: "k.koide" Date: Wed, 24 Jul 2024 11:05:03 +0900 Subject: [PATCH 1/2] rename to libgtsam-notbb-dev --- docker/deb/Dockerfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/deb/Dockerfile b/docker/deb/Dockerfile index 0c80506..ea6c6c1 100644 --- a/docker/deb/Dockerfile +++ b/docker/deb/Dockerfile @@ -14,6 +14,9 @@ RUN apt-get install -y --no-install-recommends build-essential \ RUN git clone https://github.com/borglab/gtsam.git /root/gtsam -b 4.2a9 WORKDIR /root/gtsam/build +# Rename libgtsam-dev to libgtsam-notbb-dev +RUN sed -i 's/libgtsam-dev/libgtsam-notbb-dev/g' ../cmake/HandleCPack.cmake +# Build gtsam RUN cmake .. -DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF \ -DGTSAM_BUILD_TESTS=OFF \ -DGTSAM_WITH_TBB=OFF \ @@ -44,7 +47,7 @@ COPY . /root/gtsam_points WORKDIR /root/gtsam_points/build RUN cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCPACK_DEBIAN_PACKAGE_DEPENDS="libgtsam-dev" \ + -DCPACK_DEBIAN_PACKAGE_DEPENDS="libgtsam-notbb-dev" \ -DCPACK_DEBIAN_PACKAGE_NAME="libgtsam-points-dev" RUN make -j$(nproc) RUN cpack @@ -73,7 +76,7 @@ RUN cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_WITH_CUDA=ON \ -DBUILD_WITH_CUDA_MULTIARCH=ON \ - -DCPACK_DEBIAN_PACKAGE_DEPENDS="libgtsam-dev" \ + -DCPACK_DEBIAN_PACKAGE_DEPENDS="libgtsam-notbb-dev" \ -DCPACK_DEBIAN_PACKAGE_NAME="libgtsam-points-cuda${CUDA_LABEL}-dev" RUN make -j$(nproc) RUN cpack From 53133acef1e419e2d8590d9f5df2dfb5f66a5802 Mon Sep 17 00:00:00 2001 From: "k.koide" Date: Wed, 24 Jul 2024 11:07:39 +0900 Subject: [PATCH 2/2] rename to libgtsam-notbb-dev --- docker/deb/Dockerfile.focal | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker/deb/Dockerfile.focal b/docker/deb/Dockerfile.focal index 93e1508..ce34ae8 100644 --- a/docker/deb/Dockerfile.focal +++ b/docker/deb/Dockerfile.focal @@ -14,6 +14,10 @@ RUN apt-get install -y --no-install-recommends build-essential \ RUN git clone https://github.com/borglab/gtsam.git /root/gtsam -b 4.2a9 WORKDIR /root/gtsam/build +WORKDIR /root/gtsam/build +# Rename libgtsam-dev to libgtsam-notbb-dev +RUN sed -i 's/libgtsam-dev/libgtsam-notbb-dev/g' ../cmake/HandleCPack.cmake +# Build gtsam RUN cmake .. -DGTSAM_BUILD_EXAMPLES_ALWAYS=OFF \ -DGTSAM_BUILD_TESTS=OFF \ -DGTSAM_WITH_TBB=OFF \ @@ -56,7 +60,7 @@ COPY . /root/gtsam_points WORKDIR /root/gtsam_points/build RUN cmake .. \ -DCMAKE_BUILD_TYPE=Release \ - -DCPACK_DEBIAN_PACKAGE_DEPENDS="libgtsam-dev" \ + -DCPACK_DEBIAN_PACKAGE_DEPENDS="libgtsam-notbb-dev" \ -DCPACK_DEBIAN_PACKAGE_NAME="libgtsam-points-dev" RUN make -j$(nproc) RUN cpack @@ -97,7 +101,7 @@ RUN cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_WITH_CUDA=ON \ -DBUILD_WITH_CUDA_MULTIARCH=ON \ - -DCPACK_DEBIAN_PACKAGE_DEPENDS="libgtsam-dev" \ + -DCPACK_DEBIAN_PACKAGE_DEPENDS="libgtsam-notbb-dev" \ -DCPACK_DEBIAN_PACKAGE_NAME="libgtsam-points-cuda${CUDA_LABEL}-dev" RUN make -j$(nproc) RUN cpack