[Bf-blender-cvs] [90bf426] master: cmake/buildbot: make sure we build the full blender and cycles cuda binaries

Martijn Berger noreply at git.blender.org
Mon Nov 17 13:39:41 CET 2014


Commit: 90bf426554a7cc1d429f2dd9a02edbcbeb51ceec
Author: Martijn Berger
Date:   Mon Nov 17 13:37:34 2014 +0100
Branches: master
https://developer.blender.org/rB90bf426554a7cc1d429f2dd9a02edbcbeb51ceec

cmake/buildbot: make sure we build the full blender and cycles cuda binaries

===================================================================

M	build_files/buildbot/slave_compile.py

===================================================================

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index f57ca2a..4ef4633 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:




More information about the Bf-blender-cvs mailing list