Commit: 5295202c2ca3ae6a57a0af0ddbd637c220760826
Author: Bastien Montagne
Date: Sun Oct 11 15:35:12 2015 +0200
Branches: master
https://developer.blender.org/rB5295202c2ca3ae6a57a0af0ddbd637c220760826
Revert "Buildbot: Test enable CUDA binaries for Win32"
This reverts commit 4f296138949e7aa000a1ea52646b57d640b6d563, since Cuda fails
again on win32 buildbot...
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py
b/build_files/buildbot/slave_compile.py
index d30241a..ee89bc9 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:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
