From ebbfd92859e70e0ecb2886329cb352a5875f1588 Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Sat, 4 Jun 2016 12:36:21 +0200 Subject: buildbot work around cuda / msvc compatibility issues --- build_files/buildbot/slave_compile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 9a874e92c80..7886824d0c6 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']) -- cgit v1.2.3