Commit: 1e9e621f57094475edb2753560016fa887b9117e
Author: Martijn Berger
Date: Sat Jun 4 17:41:11 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB1e9e621f57094475edb2753560016fa887b9117e
buildbot work around cuda / msvc compatibility issues attempt 2/ passing a
string from python to cmake to nvcc is harder then it looks
===================================================================
M build_files/buildbot/slave_compile.py
===================================================================
diff --git a/build_files/buildbot/slave_compile.py
b/build_files/buildbot/slave_compile.py
index 7886824..4fb879a 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -77,10 +77,10 @@ if 'cmake' in builder:
elif builder.startswith('win'):
if builder.endswith('_vc2015'):
if builder.startswith('win64'):
- cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64',
b'-DCUDA_NVCC_FLAGS="-ccbin \\"C:\\Program Files (x86)\\Microsoft Visual Studio
12.0\\VC\\bin\\amd64\\""'])
+ cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64',
b'-DCUDA_NVCC_FLAGS="-ccbin C:\\Program Files (x86)\\Microsoft Visual Studio
12.0\\VC\\bin\\amd64\\"'])
elif builder.startswith('win32'):
bits = 32
- cmake_options.extend(['-G', 'Visual Studio 14 2015',
b'-DCUDA_NVCC_FLAGS="-ccbin \\"C:\\Program Files (x86)\\Microsoft Visual Studio
12.0\\VC\\bin\\""'])
+ cmake_options.extend(['-G', 'Visual Studio 14 2015',
b'-DCUDA_NVCC_FLAGS="-ccbin 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'])
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
