[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53748] trunk/blender/build_files/buildbot /config: Buildbot: fix for missing CUDA compute after recent changes

[Sergey Sharybin]

Revision: 53748
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53748
Author:   nazgul
Date:     2013-01-12 19:17:50 +0000 (Sat, 12 Jan 2013)
Log Message:
-----------
Buildbot: fix for missing CUDA compute after recent changes

Issue was caused by how CUDA devices availability done in Cycles.
Basically, if there's no WITH_CUDA_BINARIES buildtime, nvcc becomes
mandatory dependency.

Since kernels are building in separate target now, this logic broke
a bit.

Perhaps condition in util_cuda shall be changed to be a bit smarter,
but for now just work-around by enabling CUDA binaries when building
Cycles. Made it empty arch list to be sure no kernels will try to
re-compile after cudakernels target is done.

Modified Paths:
--------------
    trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
    trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py

Modified: trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py	2013-01-12 17:12:48 UTC (rev 53747)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py	2013-01-12 19:17:50 UTC (rev 53748)
@@ -110,7 +110,8 @@
 
 # Cycles
 WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
+WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = []
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True

Modified: trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py	2013-01-12 17:12:48 UTC (rev 53747)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py	2013-01-12 19:17:50 UTC (rev 53748)
@@ -110,7 +110,8 @@
 
 # Cycles
 WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
+WITH_BF_CYCLES_CUDA_BINARIES = True
+BF_CYCLES_CUDA_BINARIES_ARCH = []
 
 WITH_BF_OIIO = True
 WITH_BF_STATICOIIO = True