Commit: f1ec564019cf852359172de6cdb44adc540c4281
Author: Sergey Sharybin
Date: Wed Jun 8 10:31:04 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rBf1ec564019cf852359172de6cdb44adc540c4281
Buildbot: Trickery for MSVC2015 and NVCC
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py
b/build_files/buildbot/slave_compile.py
index 0e72184..5e06c70 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -75,18 +75,20 @@ if 'cmake' in builder:
cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc')
elif builder.startswith('win'):
- if builder.endswith('_vc2015'):
- if builder.startswith('win64'):
- cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64',
'-DWITH_CYCLES_CUDA_BINARIES=0'])
- elif builder.startswith('win32'):
- bits = 32
- cmake_options.extend(['-G', 'Visual Studio 14 2015',
'-DWITH_CYCLES_CUDA_BINARIES=0'])
- else:
- if builder.startswith('win64'):
- cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])
- elif builder.startswith('win32'):
- bits = 32
- cmake_options.extend(['-G', 'Visual Studio 12 2013'])
+ if builder.endswith('_vc2015'):
+ if builder.startswith('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_extra_options.append('-DCUDA_NVCC_FLAGS=--cl-version;2013;' +
+ '--compiler-bindir;C:\\Program Files (x86)\\Microsoft Visual
Studio 12.0\\VC\\bin')
+ else:
+ if builder.startswith('win64'):
+ cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])
+ elif builder.startswith('win32'):
+ bits = 32
+ cmake_options.extend(['-G', 'Visual Studio 12 2013'])
elif builder.startswith('linux'):
tokens = builder.split("_")
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
