Optimize PDAL and config script

pull/347/head
Dakota Benjamin 2016-03-15 10:21:52 -04:00
rodzic cd6912af98
commit 2fa55b9ae7
2 zmienionych plików z 32 dodań i 15 usunięć

Wyświetl plik

@ -14,9 +14,26 @@ ExternalProject_Add(${_proj_name}
#--Configure step-------------
SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name}
CMAKE_ARGS
-BUILD_PGPOINTCLOUD_TESTS=ON
-BUILD_PGPOINTCLOUD_TESTS=OFF
-BUILD_PLUGIN_PCL=ON
-BUILD_PLUGIN_PGPOINTCLOUD=ON
-DBUILD_PLUGIN_CPD=OFF
-DBUILD_PLUGIN_GREYHOUND=OFF
-DBUILD_PLUGIN_HEXBIN=OFF
-DBUILD_PLUGIN_ICEBRIDGE=OFF
-DBUILD_PLUGIN_MRSID=OFF
-DBUILD_PLUGIN_NITF=OFF
-DBUILD_PLUGIN_OCI=OFF
-DBUILD_PLUGIN_P2G=OFF
-DBUILD_PLUGIN_SQLITE=OFF
-DBUILD_PLUGIN_RIVLIB=OFF
-DBUILD_PLUGIN_PYTHON=OFF
-DENABLE_CTEST=OFF
-DWITH_APPS=OFF
-DWITH_LAZPERF=OFF
-DWITH_GEOTIFF=ON
-DWITH_LASZIP=ON
-DWITH_TESTS=OFF
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
#--Build step-----------------
BINARY_DIR ${_SB_BINARY_DIR}

Wyświetl plik

@ -11,9 +11,9 @@ fi
echo -e "\e[1;34mUpdating the system\e[0;39m"
sudo apt-get update
END_CMD1=$?
sudo apt-get upgrade -y
END_CMD2=$?
if [ $END_CMD1 -ne 0 -o $END_CMD2 -ne 0 ]
# sudo apt-get upgrade -y
# END_CMD2=$?
if [ $END_CMD1 -ne 0 ]
then
echo -e "\e[1;31mERROR: \e[39mWhen Updating the system\e[0m"
exit 1
@ -28,7 +28,7 @@ sudo apt-get install build-essential \
libgdal-dev \
gdal-bin \
libgeotiff-dev \
pkg-config -y
pkg-config -y -qq
# If we have ubuntu version 14.04, the cmake version in apt-get is too low for mvs-texturing.
if [[ `lsb_release -rs` == "14.04" ]];
@ -61,7 +61,7 @@ sudo apt-get install libgtk2.0-dev \
libxext-dev \
liblapack-dev \
libeigen3-dev \
libvtk5-dev -y
libvtk5-dev -y -qq
if [ $? -ne 0 ]
then
echo -e "\e[1;31mERROR: \e[39mError when Installing Dependencies Requisites\e[0m"
@ -77,12 +77,12 @@ echo -e "\e[1;34mInstalling OpenSfM Dependencies\e[0;39m"
sudo apt-get install python-networkx \
libgoogle-glog-dev \
libsuitesparse-dev \
libboost-filesystem1.55-dev \
libboost-iostreams1.55-dev \
libboost-regex1.55-dev \
libboost-python1.55-dev \
libboost-date-time1.55-dev \
libboost-thread1.55-dev -y
libboost-filesystem-dev \
libboost-iostreams-dev \
libboost-regex-dev \
libboost-python-dev \
libboost-date-time-dev \
libboost-thread-dev -y -qq
sudo pip install -U PyYAML \
exifread \
@ -99,7 +99,7 @@ echo -e "\e[1;34mInstalling Ecto Dependencies\e[0;39m"
sudo pip install -U catkin-pkg
sudo apt-get install python-empy \
python-nose \
python-pyside -y
python-pyside -y -qq
if [ $? -ne 0 ]
then
echo -e "\e[1;31mERROR: \e[39mError when Installing Ecto Dependencies\e[0m"
@ -111,7 +111,7 @@ echo -e "\e[1;34mInstalling OpenDroneMap Dependencies\e[0;39m"
sudo apt-get install python-pyexiv2 \
python-scipy \
jhead \
liblas-bin -y
liblas-bin -y -qq
if [ $? -ne 0 ]
then
echo -e "\e[1;31mERROR: \e[39mError when Installing OpenDroneMap Dependencies\e[0m"
@ -127,6 +127,6 @@ export PYTHONPATH=$PYTHONPATH:`pwd`/SuperBuild/install/lib/python2.7/dist-packag
## Compile SuperBuild
cd SuperBuild
mkdir -p build && cd build
cmake .. && make -j ${NUM_CORES}
cmake .. && make -j${NUM_CORES}
echo -e "\e[1;34mScript finished\e[0;39m"