[Bf-blender-cvs] [f1f7f6d] master: Buildbot: Pass proper generator for MSVC 2015 builder
Sergey Sharybin
noreply at git.blender.org
Tue May 31 14:42:33 CEST 2016
Commit: f1f7f6d4b1cf3570a0e36653b9b08bc516d65f33
Author: Sergey Sharybin
Date: Tue May 31 14:42:18 2016 +0200
Branches: master
https://developer.blender.org/rBf1f7f6d4b1cf3570a0e36653b9b08bc516d65f33
Buildbot: Pass proper generator for MSVC 2015 builder
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 5e25d9f..aa643b2 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -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'):
More information about the Bf-blender-cvs
mailing list