archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Buildbot: Pass proper generator for MSVC 2015 builder

Browse Source
This commit is contained in:
Sergey Sharybin
2016-05-31 14:42:18 +02:00
parent e9c8917e10
commit f1f7f6d4b1
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build_files/buildbot/slave_compile.py
View File

@@ -75,6 +75,13 @@ 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.startswith('win64'):
cmake_options.append(['-G', '"Visual Studio 14 2015 Win64"'])
elif builder.startswith('win32'):
bits = 32
cmake_options.append(['-G', '"Visual Studio 14 2015"'])
else:
if builder.startswith('win64'):
cmake_options.append(['-G', '"Visual Studio 12 2013 Win64"'])
elif builder.startswith('win32'):