[Bf-blender-cvs] [db6da8a] master: Buildbot: Make sure optiosn override are passed after the config file

[Sergey Sharybin]

Commit: db6da8af85f4614990243a600b207a56d55b572b
Author: Sergey Sharybin
Date:   Sun Dec 20 15:32:59 2015 +0500
Branches: master
https://developer.blender.org/rBdb6da8af85f4614990243a600b207a56d55b572b

Buildbot: Make sure optiosn override are passed after the config file

===================================================================

M	build_files/buildbot/slave_compile.py

===================================================================

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 4ca57f3..cad0608 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