Updated ci config

This commit is contained in:
matlabbe
2026-06-20 12:38:11 -07:00
parent 7ca2cf75d5
commit 507cb2c483
2 changed files with 13 additions and 12 deletions
+11 -10
View File
@@ -30,6 +30,7 @@ RUN apt-get update && \
libpcl-dev \
liboctomap-dev \
libfreenect-dev \
libceres-dev \
ros-lyrical-ros-base \
ros-dev-tools \
ros-lyrical-cv-bridge \
@@ -80,16 +81,16 @@ RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then echo "Installing zed-open-cap
rm -r zed-open-capture; fi
# OpenCV with all modules (same version than distro version to avoid conflicts with cv_bridge ros package)
#RUN git clone --branch 4.10.0 https://github.com/opencv/opencv.git && \
# git clone --branch 4.10.0 https://github.com/opencv/opencv_contrib.git && \
# cd opencv && \
# mkdir build && \
# cd build && \
# cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TBB=ON -DWITH_ADE=OFF -DWITH_OPENMP=ON -DBUILD_opencv_python3=OFF -DBUILD_opencv_python_bindings_generator=OFF -DBUILD_opencv_python_tests=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DOPENCV_ENABLE_NONFREE=ON -DOPENCV_EXTRA_MODULES_PATH=/root/opencv_contrib/modules .. && \
# make -j4 && \
# make install && \
# cd ../.. && \
# rm -rf opencv opencv_contrib
RUN git clone --branch 4.10.0 https://github.com/opencv/opencv.git && \
git clone --branch 4.10.0 https://github.com/opencv/opencv_contrib.git && \
cd opencv && \
mkdir build && \
cd build && \
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TBB=ON -DWITH_ADE=OFF -DWITH_OPENMP=ON -DBUILD_opencv_python3=OFF -DBUILD_opencv_python_bindings_generator=OFF -DBUILD_opencv_python_tests=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_TESTS=OFF -DOPENCV_ENABLE_NONFREE=ON -DOPENCV_EXTRA_MODULES_PATH=/root/opencv_contrib/modules .. && \
make -j4 && \
make install && \
cd ../.. && \
rm -rf opencv opencv_contrib
RUN git clone https://github.com/laurentkneip/opengv.git && \
cd opengv && \