diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-12 09:31:19 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-12 09:31:19 +0300 |
| commit | 55354d734e98e8c733401f094b3d90d0b8ae3474 (patch) | |
| tree | eca7da78baf485962814a60ec88061ac94c374eb /build_files | |
| parent | d28d202fd113810ad05b572b785b106fcfb00992 (diff) | |
| parent | 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 43964dda691..59b35a535aa 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -77,7 +77,13 @@ if 'cmake' in builder: # cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc') elif builder.startswith('win'): - if builder.endswith('_vc2015'): + if builder.endswith('_vc2017'): + if builder.startswith('win64'): + cmake_options.extend(['-G', 'Visual Studio 15 2017 Win64']) + elif builder.startswith('win32'): + bits = 32 + cmake_options.extend(['-G', 'Visual Studio 15 2017']) + elif builder.endswith('_vc2015'): if builder.startswith('win64'): cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64']) elif builder.startswith('win32'): |