Commit 7a21fdb8 authored by Joan Vallvé Navarro's avatar Joan Vallvé Navarro
Browse files

Merge branch 'remove_vision_utils' into 'main'

removed visionutils and opencv via apt

See merge request !1
parents edfed01f 6c45c5a9
Pipeline #14525 passed with stages
in 84 minutes and 12 seconds
......@@ -453,30 +453,14 @@ if [ $INSTALL_VISION == "undefined" ]; then
fi
if [ $INSTALL_VISION == "y" ]; then
func_echo "Installing plugin vision dependencies..."
func_echo "Installing OpenCV (required by vision plugin)..."
# opencv
cd $DEPS_PATH
wget https://github.com/opencv/opencv/archive/3.3.0.zip -O temp.zip
unzip temp.zip
rm temp.zip
cd opencv-3.3.0
git clone --depth 1 -b 3.3.0 https://github.com/opencv/opencv_contrib.git
mkdir build
cd build
sed -i 's/char\* str = PyString_AsString(obj)/const char\* str = PyString_AsString(obj)/g' ../modules/python/src2/cv2.cpp
cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX=/usr/local -D CMAKE_CXX_FLAGS="-fPIC -std=c++14" -D OPENCV_EXTRA_MODULES_PATH=../opencv_contrib/modules -D WITH_FFMPEG=OFF ..
make -j$CORES
func_make_install
# vision_utils
cd $DEPS_PATH
git clone https://gitlab.iri.upc.edu/labrobotica/algorithms/vision_utils.git
cd vision_utils
mkdir -pv build && cd build
cmake -DCMAKE_BUILD_TYPE=Release ..
make -j$CORES
func_make_install
if [ "$UID" -eq 0 -o "$EUID" -eq 0 ]; then
apt install -y libopencv-dev
else
sudo apt install -y libopencv-dev
fi
func_echo "Cloning plugin vision..."
cd $WOLF_PATH
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment