From 9d0d2fb209db2aca01335d26f9cf0643e8058b11 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 3 Dec 2015 22:24:27 +0500 Subject: Buildbot: Re-enable CUDA binaries for 64 bit linux slave Also make it a bit more reasonable name for config files. --- build_files/buildbot/config/blender_linux_player.cmake | 12 ++++++++++++ build_files/buildbot/config/blender_player_linux.cmake | 12 ------------ build_files/buildbot/slave_compile.py | 7 ++++--- 3 files changed, 16 insertions(+), 15 deletions(-) create mode 100644 build_files/buildbot/config/blender_linux_player.cmake delete mode 100644 build_files/buildbot/config/blender_player_linux.cmake (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/config/blender_linux_player.cmake b/build_files/buildbot/config/blender_linux_player.cmake new file mode 100644 index 00000000000..2fb31192002 --- /dev/null +++ b/build_files/buildbot/config/blender_linux_player.cmake @@ -0,0 +1,12 @@ +# This is applied as an ovveride on top of blender_linux.config +# Disables all the areas which are not needed for the player. +set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) +set(WITH_CYCLES OFF CACHE BOOL "" FORCE) +set(WITH_FREESTYLE OFF CACHE BOOL "" FORCE) +set(WITH_GHOST_XDND OFF CACHE BOOL "" FORCE) +set(WITH_OPENCOLLADA OFF CACHE BOOL "" FORCE) +set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) +set(WITH_LIBMV OFF CACHE BOOL "" FORCE) + +set(WITH_BLENDER OFF CACHE BOOL "" FORCE) +set(WITH_PLAYER ON CACHE BOOL "" FORCE) diff --git a/build_files/buildbot/config/blender_player_linux.cmake b/build_files/buildbot/config/blender_player_linux.cmake deleted file mode 100644 index 2fb31192002..00000000000 --- a/build_files/buildbot/config/blender_player_linux.cmake +++ /dev/null @@ -1,12 +0,0 @@ -# This is applied as an ovveride on top of blender_linux.config -# Disables all the areas which are not needed for the player. -set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) -set(WITH_CYCLES OFF CACHE BOOL "" FORCE) -set(WITH_FREESTYLE OFF CACHE BOOL "" FORCE) -set(WITH_GHOST_XDND OFF CACHE BOOL "" FORCE) -set(WITH_OPENCOLLADA OFF CACHE BOOL "" FORCE) -set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) -set(WITH_LIBMV OFF CACHE BOOL "" FORCE) - -set(WITH_BLENDER OFF CACHE BOOL "" FORCE) -set(WITH_PLAYER ON CACHE BOOL "" FORCE) 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' -- cgit v1.2.3