[Bf-blender-cvs] [b04746a] master: install_deps: OSD building: disable CUDA/OpenCL backends.
Bastien Montagne
noreply at git.blender.org
Wed Feb 17 14:16:07 CET 2016
Commit: b04746a83dbddefe3306ca38ad14a73aa819634e
Author: Bastien Montagne
Date: Wed Feb 17 14:14:41 2016 +0100
Branches: master
https://developer.blender.org/rBb04746a83dbddefe3306ca38ad14a73aa819634e
install_deps: OSD building: disable CUDA/OpenCL backends.
Those are can of worms to support properly (versions mismatch, etc.),
and not used in Blender currently anyway.
===================================================================
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 10425d3..a933958 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -1808,7 +1808,7 @@ clean_OSD() {
compile_OSD() {
# To be changed each time we make edits that would modify the compiled result!
- osd_magic=0
+ osd_magic=1
_init_osd
# Clean install if needed!
@@ -1857,7 +1857,7 @@ compile_OSD() {
cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
# ptex is only needed when nicholas bishop is ready
cmake_d="$cmake_d -D NO_PTEX=1"
- cmake_d="$cmake_d -D NO_CLEW=1"
+ cmake_d="$cmake_d -D NO_CLEW=1 -D NO_CUDA=1 -D NO_OPENCL=1"
# maya plugin, docs, tutorials, regression tests and examples are not needed
cmake_d="$cmake_d -D NO_MAYA=1 -D NO_DOC=1 -D NO_TUTORIALS=1 -D NO_REGRESSION=1 -DNO_EXAMPLES=1"
More information about the Bf-blender-cvs
mailing list