Commit: b590118c4a1048a800c6a9840bfa0c3f3259014b
Author: Sergey Sharybin
Date: Tue May 31 14:42:18 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rBb590118c4a1048a800c6a9840bfa0c3f3259014b
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'):
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
