Fixing bionic docker (with cmake>=3.14)

introlab · Mar 23, 2024 · f8a63ec · f8a63ec
1 parent 7183b43
commit f8a63ec
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
@@ -24,11 +24,8 @@ ARG TARGETPLATFORM
 ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 RUN echo "I am building for $TARGETPLATFORM"
 
-# arm64
-RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then ln -s /usr/bin/cmake ~/cmake; fi
-
-# cmake >=3.11 required for amd64 dependencies
-RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then apt update && apt install -y wget && apt-get clean && rm -rf /var/lib/apt/lists/ && \
+# cmake >=3.14 required
+RUN apt update && apt install -y wget && apt-get clean && rm -rf /var/lib/apt/lists/ && \
     wget -nv https://github.com/Kitware/CMake/releases/download/v3.17.0/cmake-3.17.0-Linux-x86_64.tar.gz && \
     tar -xzf cmake-3.17.0-Linux-x86_64.tar.gz && \
     rm cmake-3.17.0-Linux-x86_64.tar.gz &&\

diff --git a/docker/bionic/android/rtabmap_apiXX/rtabmap.bash b/docker/bionic/android/rtabmap_apiXX/rtabmap.bash
@@ -48,7 +48,7 @@ rm -r arengine
 
 # resource tool
 cd rtabmap-tango/build
-cmake -DANDROID_PREBUILD=ON ..
+$pwd/cmake-3.17.0-Linux-x86_64/bin/cmake -DANDROID_PREBUILD=ON ..
 make
 cd ../..