diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-31 15:42:18 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-31 15:42:18 +0300 |
| commit | f1f7f6d4b1cf3570a0e36653b9b08bc516d65f33 (patch) | |
| tree | 9f42cbb48e824bdf3dae7c49195146df2f7f34ee /build_files | |
| parent | e9c8917e10dfada55aa0aefcde9f7098a0e8e3c7 (diff) | |
Buildbot: Pass proper generator for MSVC 2015 builder
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 5e25d9f3f04..aa643b28f8f 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -75,6 +75,13 @@ if 'cmake' in builder: cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc') elif builder.startswith('win'): + if builder.endswith('_vc14'): + if builder.startswith('win64'): + cmake_options.append(['-G', '"Visual Studio 14 2015 Win64"']) + elif builder.startswith('win32'): + bits = 32 + cmake_options.append(['-G', '"Visual Studio 14 2015"']) + else: if builder.startswith('win64'): cmake_options.append(['-G', '"Visual Studio 12 2013 Win64"']) elif builder.startswith('win32'): |