[Bf-blender-cvs] [0676badb80b] blender2.7: Fix Windows 32bit buildbot trying to use CUDA, should be disabled.
Brecht Van Lommel
noreply at git.blender.org
Sun Mar 17 12:05:29 CET 2019
Commit: 0676badb80b3137d5ee963036c9726ee78ea0be8
Author: Brecht Van Lommel
Date: Sun Mar 17 02:56:22 2019 +0100
Branches: blender2.7
https://developer.blender.org/rB0676badb80b3137d5ee963036c9726ee78ea0be8
Fix Windows 32bit buildbot trying to use CUDA, should be disabled.
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 2a71b69ed53..6a74dad5f4f 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -125,13 +125,13 @@ if 'cmake' in builder:
cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF'))
if build_cubins or 'cuda' in targets:
cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON")
-
- # Only modify common cmake options if cuda doesn't require separate target.
- if 'cuda' not in targets:
- cmake_options += cuda_cmake_options
else:
cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
+ # Only modify common cmake options if cuda doesn't require separate target.
+ if 'cuda' not in targets:
+ cmake_options += cuda_cmake_options
+
cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir))
cmake_options += cmake_extra_options
More information about the Bf-blender-cvs
mailing list