diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-10 17:53:12 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-10 17:53:12 +0300 |
| commit | 346964eb3f3c3074d30676f27ed477ce542299ea (patch) | |
| tree | 24112aba81885de0ccb4e21030df67635bae819c /build_files | |
| parent | 39451ac7128ef753da24ae74486c51a8a40e2719 (diff) | |
| parent | fd203a09330ce88725e8c5c8d9b1f9ce7b2f3c10 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/gpencil/drawgpencil.c
Diffstat (limited to 'build_files')
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 6 |
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 479585656d1..b10ae4e7a4a 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -2262,7 +2262,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" @@ -2770,7 +2772,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 |