kopia lustrzana https://github.com/OpenDroneMap/ODM
rodzic
74561ade5b
commit
4fd7af2aa2
|
@ -13,3 +13,4 @@ pcl.tar.gz
|
||||||
ceres-solver.tar.gz
|
ceres-solver.tar.gz
|
||||||
*.pyc
|
*.pyc
|
||||||
pcl.tar.gz
|
pcl.tar.gz
|
||||||
|
opencv.zip
|
||||||
|
|
|
@ -128,7 +128,7 @@ sudo apt-get install --assume-yes --install-recommends \
|
||||||
libeigen3-dev libflann-dev libvtk5-dev libqhull-dev libusb-1.0-0-dev\
|
libeigen3-dev libflann-dev libvtk5-dev libqhull-dev libusb-1.0-0-dev\
|
||||||
libzip-dev \
|
libzip-dev \
|
||||||
libswitch-perl libjson-perl \
|
libswitch-perl libjson-perl \
|
||||||
libcv-dev libcvaux-dev libopencv-dev \
|
## libcv-dev libcvaux-dev libopencv-dev \
|
||||||
gdal-bin \
|
gdal-bin \
|
||||||
exiv2 \
|
exiv2 \
|
||||||
libgoogle-glog-dev libatlas-base-dev libsuitesparse-dev \
|
libgoogle-glog-dev libatlas-base-dev libsuitesparse-dev \
|
||||||
|
@ -144,7 +144,6 @@ sudo apt-get install --assume-yes --install-recommends \
|
||||||
libjson-perl \
|
libjson-perl \
|
||||||
libzip-dev \
|
libzip-dev \
|
||||||
libswitch-perl \
|
libswitch-perl \
|
||||||
libcv-dev libcvaux-dev libopencv-dev \
|
|
||||||
libgoogle-glog-dev libatlas-base-dev libeigen3-dev libsuitesparse-dev \
|
libgoogle-glog-dev libatlas-base-dev libeigen3-dev libsuitesparse-dev \
|
||||||
python-dev python-pip libboost-python-dev \
|
python-dev python-pip libboost-python-dev \
|
||||||
python-numpy-dev python-scipy python-yaml \
|
python-numpy-dev python-scipy python-yaml \
|
||||||
|
@ -482,7 +481,7 @@ echo " > texturing "
|
||||||
cd "$ODM_TEXTURING_PATH"
|
cd "$ODM_TEXTURING_PATH"
|
||||||
|
|
||||||
echo " - configuring odm_texturing"
|
echo " - configuring odm_texturing"
|
||||||
cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" > "$TOOLS_LOG_PATH/odm_texturing_1_build.log" 2>&1
|
cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" -DOPENCV_DIR="$TOOLS_PATH/share/OpenCV" > "$TOOLS_LOG_PATH/odm_texturing_1_build.log" 2>&1
|
||||||
|
|
||||||
echo " - building odm_texturing"
|
echo " - building odm_texturing"
|
||||||
make > "$TOOLS_LOG_PATH/odm_texturing_2_build.log" 2>&1
|
make > "$TOOLS_LOG_PATH/odm_texturing_2_build.log" 2>&1
|
||||||
|
@ -512,7 +511,7 @@ echo " > georef "
|
||||||
cd "$ODM_GEOREF_PATH"
|
cd "$ODM_GEOREF_PATH"
|
||||||
|
|
||||||
echo " - configuring odm_georef"
|
echo " - configuring odm_georef"
|
||||||
cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" > "$TOOLS_LOG_PATH/odm_georef_1_build.log" 2>&1
|
cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" -DOPENCV_DIR="$TOOLS_PATH/share/OpenCV" > "$TOOLS_LOG_PATH/odm_georef_1_build.log" 2>&1
|
||||||
|
|
||||||
echo " - building odm_georef"
|
echo " - building odm_georef"
|
||||||
make > "$TOOLS_LOG_PATH/odm_georef_2_build.log" 2>&1
|
make > "$TOOLS_LOG_PATH/odm_georef_2_build.log" 2>&1
|
||||||
|
@ -527,7 +526,7 @@ echo " > orthophoto "
|
||||||
cd "$ODM_ORTHOPHOTO_PATH"
|
cd "$ODM_ORTHOPHOTO_PATH"
|
||||||
|
|
||||||
echo " - configuring odm_orthophoto"
|
echo " - configuring odm_orthophoto"
|
||||||
cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" > "$TOOLS_LOG_PATH/odm_orthophoto_1_build.log" 2>&1
|
cmake . -DPCL_DIR="$TOOLS_LIB_PATH/pcl" -DOPENCV_DIR="$TOOLS_PATH/share/OpenCV" > "$TOOLS_LOG_PATH/odm_orthophoto_1_build.log" 2>&1
|
||||||
|
|
||||||
echo " - building odm_orthophoto"
|
echo " - building odm_orthophoto"
|
||||||
make > "$TOOLS_LOG_PATH/odm_orthophoto_2_build.log" 2>&1
|
make > "$TOOLS_LOG_PATH/odm_orthophoto_2_build.log" 2>&1
|
||||||
|
|
|
@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
# Set pcl dir to the input spedified with option -DPCL_DIR="path"
|
# Set pcl dir to the input spedified with option -DPCL_DIR="path"
|
||||||
set(PCL_DIR "PCL_DIR-NOTFOUND" CACHE "PCL_DIR" "Path to the pcl installation directory")
|
set(PCL_DIR "PCL_DIR-NOTFOUND" CACHE "PCL_DIR" "Path to the pcl installation directory")
|
||||||
|
set(OPENCV_DIR "OPENCV_DIR-NOTFOUND" CACHE "OPENCV_DIR" "Path to the opencv installation directory")
|
||||||
set(PROJ4_INCLUDE_DIR "/usr/include/" CACHE "PROJ4_INCLUDE_DIR" "Path to the proj4 inlcude directory")
|
set(PROJ4_INCLUDE_DIR "/usr/include/" CACHE "PROJ4_INCLUDE_DIR" "Path to the proj4 inlcude directory")
|
||||||
set(PROJ4_LIBRARY "/usr/lib/libproj.so" CACHE "PROJ4_LIBRARY" "Path to the proj4 library directory")
|
set(PROJ4_LIBRARY "/usr/lib/libproj.so" CACHE "PROJ4_LIBRARY" "Path to the proj4 library directory")
|
||||||
|
|
||||||
|
@ -14,7 +15,7 @@ add_definitions(-Wall -Wextra -Wconversion -pedantic)
|
||||||
find_package(PCL 1.7 HINTS "${PCL_DIR}/share/pcl-1.7")
|
find_package(PCL 1.7 HINTS "${PCL_DIR}/share/pcl-1.7")
|
||||||
|
|
||||||
# Find OpenCV at the default location
|
# Find OpenCV at the default location
|
||||||
find_package(OpenCV REQUIRED)
|
find_package(OpenCV HINTS "${OPENCV_DIR}" REQUIRED)
|
||||||
|
|
||||||
# Only link with required opencv modules.
|
# Only link with required opencv modules.
|
||||||
set(OpenCV_LIBS opencv_core opencv_imgproc opencv_highgui)
|
set(OpenCV_LIBS opencv_core opencv_imgproc opencv_highgui)
|
||||||
|
|
|
@ -3,6 +3,7 @@ cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
# Set pcl dir to the input spedified with option -DPCL_DIR="path"
|
# Set pcl dir to the input spedified with option -DPCL_DIR="path"
|
||||||
set(PCL_DIR "PCL_DIR-NOTFOUND" CACHE "PCL_DIR" "Path to the pcl installation directory")
|
set(PCL_DIR "PCL_DIR-NOTFOUND" CACHE "PCL_DIR" "Path to the pcl installation directory")
|
||||||
|
set(OPENCV_DIR "OPENCV_DIR-NOTFOUND" CACHE "OPENCV_DIR" "Path to the OPENCV installation directory")
|
||||||
|
|
||||||
# Add compiler options.
|
# Add compiler options.
|
||||||
add_definitions(-Wall -Wextra)
|
add_definitions(-Wall -Wextra)
|
||||||
|
@ -11,7 +12,7 @@ add_definitions(-Wall -Wextra)
|
||||||
find_package(PCL 1.7 HINTS "${PCL_DIR}/share/pcl-1.7" REQUIRED)
|
find_package(PCL 1.7 HINTS "${PCL_DIR}/share/pcl-1.7" REQUIRED)
|
||||||
|
|
||||||
# Find OpenCV at the default location
|
# Find OpenCV at the default location
|
||||||
find_package(OpenCV REQUIRED)
|
find_package(OpenCV HINTS "${OPENCV_DIR}" REQUIRED)
|
||||||
|
|
||||||
# Only link with required opencv modules.
|
# Only link with required opencv modules.
|
||||||
set(OpenCV_LIBS opencv_core opencv_imgproc opencv_highgui)
|
set(OpenCV_LIBS opencv_core opencv_imgproc opencv_highgui)
|
||||||
|
|
|
@ -4,6 +4,9 @@ cmake_minimum_required(VERSION 2.8)
|
||||||
# Set pcl dir to the input spedified with option -DPCL_DIR="path"
|
# Set pcl dir to the input spedified with option -DPCL_DIR="path"
|
||||||
set(PCL_DIR "PCL_DIR-NOTFOUND" CACHE "PCL_DIR" "Path to the pcl installation directory")
|
set(PCL_DIR "PCL_DIR-NOTFOUND" CACHE "PCL_DIR" "Path to the pcl installation directory")
|
||||||
|
|
||||||
|
# Set opencv dir to the input spedified with option -DOPENCV_DIR="path"
|
||||||
|
set(OPENCV_DIR "OPENCV_DIR-NOTFOUND" CACHE "OPENCV_DIR" "Path to the opencv installation directory")
|
||||||
|
|
||||||
# Add compiler options.
|
# Add compiler options.
|
||||||
add_definitions(-Wall -Wextra)
|
add_definitions(-Wall -Wextra)
|
||||||
|
|
||||||
|
@ -11,7 +14,7 @@ add_definitions(-Wall -Wextra)
|
||||||
find_package(PCL 1.7 HINTS "${PCL_DIR}/share/pcl-1.7" REQUIRED)
|
find_package(PCL 1.7 HINTS "${PCL_DIR}/share/pcl-1.7" REQUIRED)
|
||||||
|
|
||||||
# Find OpenCV at the default location
|
# Find OpenCV at the default location
|
||||||
find_package(OpenCV REQUIRED)
|
find_package(OpenCV HINTS "${OPENCV_DIR}" REQUIRED)
|
||||||
|
|
||||||
# Only link with required opencv modules.
|
# Only link with required opencv modules.
|
||||||
set(OpenCV_LIBS opencv_core opencv_imgproc opencv_highgui)
|
set(OpenCV_LIBS opencv_core opencv_imgproc opencv_highgui)
|
||||||
|
|
Ładowanie…
Reference in New Issue