Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Rood <dev@lucarood.com>2017-04-10 16:53:37 +0300
committerLuca Rood <dev@lucarood.com>2017-04-10 16:55:25 +0300
commit358def15a35ca3d05b53a879f1d4c6b403667d39 (patch)
treef6d633100d1f78eef2242b2dfdba822b653ec71b /build_files
parent9539cfacca8ca2aeda1ff48113b6db872ff38eed (diff)
Install deps: Fix compilation error of Alembic
Couple of things here: - Boost is not necesserily compiled into your /opt/lib and system-wide version might have been used. The recent change in Alembic did not take this into account. - Alembic needs some extra component of Boost. This part might be missing now for other distros than DEB.
Diffstat (limited to 'build_files')
-rwxr-xr-xbuild_files/build_environment/install_deps.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 7aaa37285c1..82895acf25e 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -2270,7 +2270,9 @@ compile_ALEMBIC() {
fi
if [ -d $INST/boost ]; then
- cmake_d="$cmake_d -D BOOST_ROOT=$INST/boost"
+ if [ -d $INST/boost ]; then
+ cmake_d="$cmake_d -D BOOST_ROOT=$INST/boost"
+ fi
cmake_d="$cmake_d -D USE_STATIC_BOOST=ON"
else
cmake_d="$cmake_d -D USE_STATIC_BOOST=OFF"
@@ -2778,7 +2780,7 @@ install_DEB() {
boost_version=$(echo `get_package_version_DEB libboost-dev` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')
- install_packages_DEB libboost-{filesystem,iostreams,locale,regex,system,thread,wave}$boost_version-dev
+ install_packages_DEB libboost-{filesystem,iostreams,locale,regex,system,thread,wave,program-options}$boost_version-dev
clean_Boost
else
compile_Boost