Fix Windows 32bit buildbot trying to use CUDA, should be disabled.
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 17 Mar 2019 01:56:22 +0000 (02:56 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 17 Mar 2019 11:01:19 +0000 (12:01 +0100)
build_files/buildbot/slave_compile.py

index 2a71b69..6a74dad 100644 (file)
@@ -125,13 +125,13 @@ if 'cmake' in builder:
         cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF'))
         if build_cubins or 'cuda' in targets:
             cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON")
-
-        # Only modify common cmake options if cuda doesn't require separate target.
-        if 'cuda' not in targets:
-            cmake_options += cuda_cmake_options
     else:
         cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
 
+    # Only modify common cmake options if cuda doesn't require separate target.
+    if 'cuda' not in targets:
+        cmake_options += cuda_cmake_options
+
     cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir))
 
     cmake_options += cmake_extra_options