[Bf-blender-cvs] [bdbe0f3] compositor-2016: buildbot work around cuda / msvc compatibility issues

Martijn Berger noreply at git.blender.org
Wed Jun 8 21:52:56 CEST 2016


Commit: bdbe0f3e1a8f3ede6cb7386ec877c981fb8d5f24
Author: Martijn Berger
Date:   Sat Jun 4 12:36:21 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rBbdbe0f3e1a8f3ede6cb7386ec877c981fb8d5f24

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'])




More information about the Bf-blender-cvs mailing list