diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-05-31 15:42:18 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2016-06-08 22:45:40 +0300 |
| commit | b590118c4a1048a800c6a9840bfa0c3f3259014b (patch) | |
| tree | 8893854a5510f2b25cfa54dbac42ce96c12444ac | |
| parent | 4dc81827c8bcd87da618b93723486a738ba7fbc5 (diff) | |
Buildbot: Pass proper generator for MSVC 2015 builder
| -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'): |