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:
authorBastien Montagne <montagne29@wanadoo.fr>2015-10-11 16:35:12 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2015-10-11 16:35:48 +0300
commit5295202c2ca3ae6a57a0af0ddbd637c220760826 (patch)
treebb6920fd3ed79f9b795fc59f1bada9ef733cac3e
parent8a1afc28db8274feafce42f752374e623b416790 (diff)
Revert "Buildbot: Test enable CUDA binaries for Win32"
This reverts commit 4f296138949e7aa000a1ea52646b57d640b6d563, since Cuda fails again on win32 buildbot...
-rw-r--r--build_files/buildbot/slave_compile.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index d30241a9e5c..ee89bc90225 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -52,7 +52,10 @@ if 'cmake' in builder:
cmake_options.append(['-G', '"Visual Studio 12 2013"'])
cmake_options.append("-C../blender.git/build_files/cmake/config/blender_full.cmake")
- cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=1")
+ if 'win32' not in builder:
+ cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=1")
+ else:
+ cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=0")
# configure and make
retcode = subprocess.call(['cmake', blender_dir] + cmake_options)
if retcode != 0: