[Bf-blender-cvs] [230cf2e] master: Buildbot: Attempt to fix buildbot after recent change
Sergey Sharybin
noreply at git.blender.org
Tue May 31 15:28:15 CEST 2016
Commit: 230cf2e46de2dea9303159a93ac00596c2918470
Author: Sergey Sharybin
Date: Tue May 31 15:27:07 2016 +0200
Branches: master
https://developer.blender.org/rB230cf2e46de2dea9303159a93ac00596c2918470
Buildbot: Attempt to fix buildbot after recent change
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index c82fe4a..9a874e9 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -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("_")
More information about the Bf-blender-cvs
mailing list