[Bf-blender-cvs] [ebbfd92] master: buildbot work around cuda / msvc compatibility issues

[Martijn Berger]

Commit: ebbfd92859e70e0ecb2886329cb352a5875f1588
Author: Martijn Berger
Date:   Sat Jun 4 12:36:21 2016 +0200
Branches: master
https://developer.blender.org/rBebbfd92859e70e0ecb2886329cb352a5875f1588

buildbot work around cuda / msvc compatibility issues

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

M	build_files/buildbot/slave_compile.py

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

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 9a874e9..7886824 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -77,10 +77,10 @@ if 'cmake' in builder:
     elif builder.startswith('win'):
       if builder.endswith('_vc2015'):
         if builder.startswith('win64'):
-            cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64'])
+            cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64', b'-DCUDA_NVCC_FLAGS="-ccbin \\"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin\\amd64\\""'])
         elif builder.startswith('win32'):
             bits = 32
-            cmake_options.extend(['-G', 'Visual Studio 14 2015'])
+            cmake_options.extend(['-G', 'Visual Studio 14 2015', b'-DCUDA_NVCC_FLAGS="-ccbin \\"C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin\\""'])
       else:
         if builder.startswith('win64'):
             cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])