diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-03 20:24:27 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-03 20:24:27 +0300 |
| commit | 9d0d2fb209db2aca01335d26f9cf0643e8058b11 (patch) | |
| tree | 94511b8902bebdd159aa7efe92ea64ac97b184fc /build_files/buildbot | |
| parent | dc0c6489142d8328d9236c847e5a3d183626e3af (diff) | |
Buildbot: Re-enable CUDA binaries for 64 bit linux slave
Also make it a bit more reasonable name for config files.
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/config/blender_linux_player.cmake (renamed from build_files/buildbot/config/blender_player_linux.cmake) | 0 | ||||
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 7 |
2 files changed, 4 insertions, 3 deletions
diff --git a/build_files/buildbot/config/blender_player_linux.cmake b/build_files/buildbot/config/blender_linux_player.cmake index 2fb31192002..2fb31192002 100644 --- a/build_files/buildbot/config/blender_player_linux.cmake +++ b/build_files/buildbot/config/blender_linux_player.cmake diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index e0802ca30b1..8365ccb4d93 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -76,11 +76,12 @@ if 'cmake' in builder: remove_cache = True remove_install_dir = True cmake_config_file = "build_files/buildbot/config/blender_linux.cmake" - cmake_player_config_file = "build_files/buildbot/config/blender_player_linux.cmake" - cmake_cuda_config_file = "build_files/buildbot/config/blender_cuda_linux.cmake" + cmake_player_config_file = "build_files/buildbot/config/blender_linux_player.cmake" + # Currently unused + # cmake_cuda_config_file = "build_files/buildbot/config/blender_linux_cuda.cmake" if builder.endswith('x86_64_cmake'): chroot_name = 'buildbot_squeeze_x86_64' - build_cubins = False + build_cubins = True targets = ['player', 'blender'] elif builder.endswith('i386_cmake'): chroot_name = 'buildbot_squeeze_i686' |