Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2016-06-04 18:41:11 +0300
committerMartijn Berger <martijn.berger@gmail.com>2016-06-04 18:41:11 +0300
commit1d8637ec69275b4958034b112db81f4cf42cd521 (patch)
tree582226822f886b4d0a2aa53a5590efb5756776a6 /build_files
parentebbfd92859e70e0ecb2886329cb352a5875f1588 (diff)
buildbot work around cuda / msvc compatibility issues attempt 2/ passing a string from python to cmake to nvcc is harder then it looks
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/slave_compile.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 7886824d0c6..4fb879aea3b 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'])