diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-20 13:32:59 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-12-20 13:32:59 +0300 |
| commit | db6da8af85f4614990243a600b207a56d55b572b (patch) | |
| tree | 62f1dff9c5731d4a5cc9a5727ff9fe2a817e0e77 /build_files/buildbot | |
| parent | f01714506a393c8a0b6240633e09a97cab4727ab (diff) | |
Buildbot: Make sure optiosn override are passed after the config file
Diffstat (limited to 'build_files/buildbot')
| -rw-r--r-- | build_files/buildbot/slave_compile.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 4ca57f39562..cad0608d44f 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -53,22 +53,23 @@ if 'cmake' in builder: cmake_cuda_config_file = None # Set build options. - cmake_options = ['-DCMAKE_BUILD_TYPE:STRING=Release'] + cmake_options = [] + cmake_extra_options = ['-DCMAKE_BUILD_TYPE:STRING=Release'] if builder.startswith('mac'): remove_cache = True install_dir = None # Set up OSX architecture if builder.endswith('x86_64_10_6_cmake'): - cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') + cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') elif builder.endswith('i386_10_6_cmake'): build_cubins = False - cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=i386') + cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=i386') # Some special options to disable usupported features - cmake_options.append("-DWITH_CYCLES_OSL=OFF") - cmake_options.append("-DWITH_OPENCOLLADA=OFF") + cmake_extra_options.append("-DWITH_CYCLES_OSL=OFF") + cmake_extra_options.append("-DWITH_OPENCOLLADA=OFF") elif builder.endswith('ppc_10_6_cmake'): - cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc') + cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc') elif builder.startswith('win'): install_dir = None @@ -94,12 +95,13 @@ if 'cmake' in builder: build_cubins = False targets = ['player', 'blender'] + cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%d" % (build_cubins)) if install_dir: cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir)) - cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) + cmake_options += cmake_extra_options # Prepare chroot command prefix if needed |