Former-commit-id: 86df04cbd8
gh-pages
Chris Cooper 2015-07-03 11:07:55 +10:00
rodzic 36e8c657bd
commit 391ba69116
3 zmienionych plików z 30 dodań i 10 usunięć

1
.gitignore vendored
Wyświetl plik

@ -9,3 +9,4 @@ odm_texturing-build/
cmvs.tar.gz cmvs.tar.gz
parallel.tar.bz2 parallel.tar.bz2
pcl.tar.gz pcl.tar.gz
ceres-solver.tar.gz

Wyświetl plik

@ -31,14 +31,15 @@ echo " - script started - `date`"
INC_PATH="/usr/local/include" INC_PATH="/usr/local/include"
## source paths ## source paths
BUNDLER_PATH="$TOOLS_SRC_PATH/bundler" BUNDLER_PATH="$TOOLS_SRC_PATH/bundler"
CMVS_PATH="$TOOLS_SRC_PATH/cmvs" CMVS_PATH="$TOOLS_SRC_PATH/cmvs"
PMVS_PATH="$TOOLS_SRC_PATH/pmvs" PMVS_PATH="$TOOLS_SRC_PATH/pmvs"
CLAPACK_PATH="$TOOLS_SRC_PATH/clapack" CLAPACK_PATH="$TOOLS_SRC_PATH/clapack"
VLFEAT_PATH="$TOOLS_SRC_PATH/vlfeat" VLFEAT_PATH="$TOOLS_SRC_PATH/vlfeat"
PARALLEL_PATH="$TOOLS_SRC_PATH/parallel" PARALLEL_PATH="$TOOLS_SRC_PATH/parallel"
PSR_PATH="$TOOLS_SRC_PATH/PoissonRecon" PSR_PATH="$TOOLS_SRC_PATH/PoissonRecon"
GRACLUS_PATH="$TOOLS_SRC_PATH/graclus" GRACLUS_PATH="$TOOLS_SRC_PATH/graclus"
CERES_PATH="$TOOLS_SRC_PATH/ceres-solver"
PCL_PATH="$TOOLS_SRC_PATH/pcl" PCL_PATH="$TOOLS_SRC_PATH/pcl"
ODM_MESHING_PATH="$TOOLS_SRC_PATH/odm_meshing" ODM_MESHING_PATH="$TOOLS_SRC_PATH/odm_meshing"
@ -124,6 +125,7 @@ sudo apt-get install --assume-yes --install-recommends \
libzip-dev \ libzip-dev \
libswitch-perl libjson-perl \ libswitch-perl libjson-perl \
libcv-dev libcvaux-dev libopencv-dev \ libcv-dev libcvaux-dev libopencv-dev \
libgoogle-glog-dev libatlas-base-dev libsuitesparse-dev \
> "$TOOLS_LOG_PATH/apt-get_install.log" 2>&1 > "$TOOLS_LOG_PATH/apt-get_install.log" 2>&1
else else
sudo apt-get install --assume-yes --install-recommends \ sudo apt-get install --assume-yes --install-recommends \
@ -137,6 +139,7 @@ sudo apt-get install --assume-yes --install-recommends \
libzip-dev \ libzip-dev \
libswitch-perl \ libswitch-perl \
libcv-dev libcvaux-dev libopencv-dev \ libcv-dev libcvaux-dev libopencv-dev \
libgoogle-glog-dev libatlas-base-dev libsuitesparse-dev \
> "$TOOLS_LOG_PATH/apt-get_install.log" 2>&1 > "$TOOLS_LOG_PATH/apt-get_install.log" 2>&1
fi fi
@ -170,6 +173,7 @@ vlfeat.tar.gz http://www.vlfeat.org/download/vlfeat-0.9.13-bin.tar.gz
cmvs.tar.gz http://www.di.ens.fr/cmvs/cmvs-fix2.tar.gz cmvs.tar.gz http://www.di.ens.fr/cmvs/cmvs-fix2.tar.gz
graclus.tar.gz http://smathermather.github.io/BundlerTools/patched_files/src/graclus/graclus1.2.tar.gz graclus.tar.gz http://smathermather.github.io/BundlerTools/patched_files/src/graclus/graclus1.2.tar.gz
pcl.tar.gz https://github.com/PointCloudLibrary/pcl/archive/pcl-1.7.2.tar.gz pcl.tar.gz https://github.com/PointCloudLibrary/pcl/archive/pcl-1.7.2.tar.gz
ceres-solver.tar.gz http://ceres-solver.org/ceres-solver-1.10.0.tar.gz
EOF EOF
echo " < done - `date`" echo " < done - `date`"
@ -197,7 +201,7 @@ mv -f parallel-20141022 "$PARALLEL_PATH"
mv -f PoissonRecon "$PSR_PATH" mv -f PoissonRecon "$PSR_PATH"
mv -f cmvs "$CMVS_PATH" mv -f cmvs "$CMVS_PATH"
mv -f pcl-pcl-1.7.2 "$PCL_PATH" mv -f pcl-pcl-1.7.2 "$PCL_PATH"
mv -f ceres-solver-1.10.0 "$CERES_PATH"
echo " < done - `date`" echo " < done - `date`"
@ -348,6 +352,21 @@ echo " > cmvs/pmvs"
echo " < done - `date`" echo " < done - `date`"
echo echo
echo " > ceres"
cd "$CERES_PATH"
echo " - configuring ceres"
mkdir -p build
cd build
cmake .. -DCMAKE_INSTALL_PREFIX=$TOOLS_PATH \
-DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC \
-DBUILD_EXAMPLES=OFF -DBUILD_TESTING=OFF > "$TOOLS_LOG_PATH/ceres_1_config.log" 2>&1
echo " - building ceres"
make install > "$TOOLS_LOG_PATH/ceres_1_build.log" 2>&1
echo " < done - `date`"
echo
echo " > bundler" echo " > bundler"
cd "$BUNDLER_PATH" cd "$BUNDLER_PATH"

@ -1 +1 @@
Subproject commit a281e1f9ff240703b49f8304572f1addb24205fd Subproject commit b34cc5dcd54345272028b68f82fa4d0ae8a103c9