From 2ac0fae807599be901f1e1ae4d7bc2f24929371a Mon Sep 17 00:00:00 2001 From: Pau Gargallo Date: Wed, 4 Nov 2015 00:13:10 +0100 Subject: [PATCH] Keep using ubuntu's opencv --- install.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 2d3d617b..81a7117d 100755 --- a/install.sh +++ b/install.sh @@ -123,6 +123,7 @@ sudo apt-get install --assume-yes --install-recommends \ libeigen3-dev libflann-dev libvtk5-dev libqhull-dev libusb-1.0-0-dev\ libzip-dev \ libswitch-perl libjson-perl \ + libcv-dev libcvaux-dev libopencv-dev \ gdal-bin \ exiv2 \ libgoogle-glog-dev libatlas-base-dev libsuitesparse-dev \ @@ -138,6 +139,7 @@ sudo apt-get install --assume-yes --install-recommends \ libjson-perl \ libzip-dev \ libswitch-perl \ + libcv-dev libcvaux-dev libopencv-dev \ libgoogle-glog-dev libatlas-base-dev libeigen3-dev libsuitesparse-dev \ python-dev python-pip libboost-python-dev \ python-numpy-dev python-scipy python-yaml \ @@ -463,7 +465,7 @@ echo " > texturing " cd "$ODM_TEXTURING_PATH" echo " - configuring odm_texturing" - cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" -DOPENCV_DIR="$TOOLS_PATH/share/OpenCV" > "$TOOLS_LOG_PATH/odm_texturing_1_build.log" 2>&1 + cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" > "$TOOLS_LOG_PATH/odm_texturing_1_build.log" 2>&1 echo " - building odm_texturing" make -j$CORES > "$TOOLS_LOG_PATH/odm_texturing_2_build.log" 2>&1 @@ -493,7 +495,7 @@ echo " > georef " cd "$ODM_GEOREF_PATH" echo " - configuring odm_georef" - cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" -DOPENCV_DIR="$TOOLS_PATH/share/OpenCV" > "$TOOLS_LOG_PATH/odm_georef_1_build.log" 2>&1 + cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" > "$TOOLS_LOG_PATH/odm_georef_1_build.log" 2>&1 echo " - building odm_georef" make -j$CORES > "$TOOLS_LOG_PATH/odm_georef_2_build.log" 2>&1 @@ -508,7 +510,7 @@ echo " > orthophoto " cd "$ODM_ORTHOPHOTO_PATH" echo " - configuring odm_orthophoto" - cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" -DOPENCV_DIR="$TOOLS_PATH/share/OpenCV" > "$TOOLS_LOG_PATH/odm_orthophoto_1_build.log" 2>&1 + cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" > "$TOOLS_LOG_PATH/odm_orthophoto_1_build.log" 2>&1 echo " - building odm_orthophoto" make -j$CORES > "$TOOLS_LOG_PATH/odm_orthophoto_2_build.log" 2>&1