[Bf-blender-cvs] [d46cb486ed3] blender2.7: Include blosc, embree and opencollada into BUILD_NOTES.txt file.
Bastien Montagne
noreply at git.blender.org
Mon Mar 25 11:04:28 CET 2019
Commit: d46cb486ed31401152585fe3b201538b9adb2d0b
Author: Bastien Montagne
Date: Mon Mar 25 11:03:52 2019 +0100
Branches: blender2.7
https://developer.blender.org/rBd46cb486ed31401152585fe3b201538b9adb2d0b
Include blosc, embree and opencollada into BUILD_NOTES.txt file.
For custom path selected during 'install_deps.sh' using '--source'/'--install', paths for blosc, embree and opencollada are not printed/inclued into BUILD_NOTES.txt file.
As '/opt/lib/<package>' paths are hardcoded into CMakes's Find* modules, this error is not noticeable, but for custom paths it is.
This patch includes those fixes/prints for those packages.
Reviewers: mont29
Reviewed By: mont29
Differential Revision: https://developer.blender.org/D4574
===================================================================
M build_files/build_environment/install_deps.sh
===================================================================
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 19278e1a086..5d95bd359e1 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -4529,18 +4529,33 @@ print_info() {
PRINT " $_1"
_buildargs="$_buildargs $_1"
fi
+ if [ -d $INST/blosc ]; then
+ _1="-D BLOSC_ROOT_DIR=$INST/blosc"
+ PRINT " $_1"
+ _buildargs="$_buildargs $_1"
+ fi
fi
if [ "$WITH_OPENCOLLADA" = true ]; then
_1="-D WITH_OPENCOLLADA=ON"
PRINT " $_1"
_buildargs="$_buildargs $_1"
+ if [ -d $INST/opencollada ]; then
+ _1="-D OPENCOLLADA_ROOT_DIR=$INST/opencollada"
+ PRINT " $_1"
+ _buildargs="$_buildargs $_1"
+ fi
fi
if [ "$WITH_EMBREE" = true ]; then
_1="-D WITH_CYCLES_EMBREE=ON"
PRINT " $_1"
_buildargs="$_buildargs $_1"
+ if [ -d $INST/embree ]; then
+ _1="-D EMBREE_ROOT_DIR=$INST/embree"
+ PRINT " $_1"
+ _buildargs="$_buildargs $_1"
+ fi
fi
if [ "$WITH_JACK" = true ]; then
More information about the Bf-blender-cvs
mailing list