forked from bartvdbraak/blender
buildbot work around cuda / msvc compatibility issues
This commit is contained in:
parent
50f432b1e0
commit
ebbfd92859
@ -77,10 +77,10 @@ if 'cmake' in builder:
|
|||||||
elif builder.startswith('win'):
|
elif builder.startswith('win'):
|
||||||
if builder.endswith('_vc2015'):
|
if builder.endswith('_vc2015'):
|
||||||
if builder.startswith('win64'):
|
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'):
|
elif builder.startswith('win32'):
|
||||||
bits = 32
|
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:
|
else:
|
||||||
if builder.startswith('win64'):
|
if builder.startswith('win64'):
|
||||||
cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])
|
cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])
|
||||||
|
Loading…
Reference in New Issue
Block a user