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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-17 04:56:22 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-17 14:01:19 +0300
commit0676badb80b3137d5ee963036c9726ee78ea0be8 (patch)
tree90de940cbb359cc711ba8196b9e054fa4575d75b /build_files
parent7778a1a0a12fc026dc5bcc2c195b9460d1c77b53 (diff)
Fix Windows 32bit buildbot trying to use CUDA, should be disabled.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/slave_compile.py8
1 files changed, 4 insertions, 4 deletions
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