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:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-16 15:36:59 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-07-16 15:36:59 +0300
commitde2f1c64fe4b353899d99d85d6e9aee16ce17688 (patch)
tree7e90ac4ca2aac5ffb34759f61112ed5c6d7cf63e /build_files
parente1423391621dcc72e55144541cb26b540698edba (diff)
parent80795ff8976fabb210ef139f94d60a9e1080c8ce (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/slave_compile.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 59b35a535aa..a77f237e978 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -77,7 +77,7 @@ if 'cmake' in builder:
# cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
elif builder.startswith('win'):
- if builder.endswith('_vc2017'):
+ if builder.endswith('_vs2017'):
if builder.startswith('win64'):
cmake_options.extend(['-G', 'Visual Studio 15 2017 Win64'])
elif builder.startswith('win32'):