sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Buildbot: Attempt to fix buildbot after recent change

Browse Source
This commit is contained in:
Sergey Sharybin 2016-05-31 15:27:07 +02:00
parent 9e77a03f63
commit 230cf2e46d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_files/buildbot/slave_compile.py
View File

@ -75,18 +75,18 @@ if 'cmake' in builder:
cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc')
elif builder.startswith('win'):
if builder.endswith('_vc14'):
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'])
elif builder.startswith('win32'):
bits = 32
cmake_options.extend(['-G', '"Visual Studio 14 2015"'])
cmake_options.extend(['-G', 'Visual Studio 14 2015'])
else:
if builder.startswith('win64'):
cmake_options.extend(['-G', '"Visual Studio 12 2013 Win64"'])
cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])
elif builder.startswith('win32'):
bits = 32
cmake_options.extend(['-G', '"Visual Studio 12 2013"'])
cmake_options.extend(['-G', 'Visual Studio 12 2013'])
elif builder.startswith('linux'):
tokens = builder.split("_")