Commit: 20344cc1528b515344e6533c7403a0b72171026e Author: Martijn Berger Date: Tue Jun 7 20:56:44 2016 +0200 Branches: compositor-2016 https://developer.blender.org/rB20344cc1528b515344e6533c7403a0b72171026e
Cuda 7.5 cannot be made to work with a supported cl.exe version in the same way as cuda 6.0 does allow, disabling cuda kernels on buildbot for now =================================================================== M build_files/buildbot/slave_compile.py =================================================================== diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 4fb879a..ff5968a 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', b'-DCUDA_NVCC_FLAGS="-ccbin C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin\\amd64\\"']) + cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64', '-DWITH_CYCLES_CUDA_BINARIES=0'']) elif builder.startswith('win32'): bits = 32 - cmake_options.extend(['-G', 'Visual Studio 14 2015', b'-DCUDA_NVCC_FLAGS="-ccbin C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin\\"']) + cmake_options.extend(['-G', 'Visual Studio 14 2015', '-DWITH_CYCLES_CUDA_BINARIES=0']) else: if builder.startswith('win64'): cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64']) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs