diff options
author | Martijn Berger <martijn.berger@gmail.com> | 2016-06-07 21:56:44 +0300 |
---|---|---|
committer | Martijn Berger <martijn.berger@gmail.com> | 2016-06-07 21:56:44 +0300 |
commit | d16635e4976257982c6b644d8b97ad2df357caf4 (patch) | |
tree | f356e922b79d04fb144d2764114fafdc49829d7f /build_files | |
parent | f3d33a1a0f1dd4092d35760027f495bc21d1e4be (diff) |
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
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/slave_compile.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 4fb879aea3b..ff5968acf2f 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']) |