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:
authorMartijn Berger <martijn.berger@gmail.com>2014-11-17 15:37:34 +0300
committerMartijn Berger <martijn.berger@gmail.com>2014-11-17 15:37:34 +0300
commit90bf426554a7cc1d429f2dd9a02edbcbeb51ceec (patch)
tree400bb7aab7799c9a67f3fe77dde91a8111e440ec
parent694d74bc6d47aee6bef96503037008aa866ed560 (diff)
cmake/buildbot: make sure we build the full blender and cycles cuda binaries
-rw-r--r--build_files/buildbot/slave_compile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index f57ca2ac9b7..4ef46331c64 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -47,12 +47,12 @@ if 'cmake' in builder:
cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc')
if 'win64' in builder:
-
cmake_options.append(['-G','"Visual Studio 12 2013 Win64"'])
elif 'win32' 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")
# configure and make
retcode = subprocess.call(['cmake', blender_dir] + cmake_options)
if retcode != 0: