cycles: Fix x86 build error.
authorRay Molenkamp <github@lazydodo.com>
Tue, 4 Sep 2018 22:58:41 +0000 (16:58 -0600)
committerRay Molenkamp <github@lazydodo.com>
Tue, 4 Sep 2018 22:58:41 +0000 (16:58 -0600)
WITH_CYCLES_CUDA_BINARIES was set as a regular variable causing it to be overwritten by the release.cmake settings.

intern/cycles/app/CMakeLists.txt

index cfca45600a5e3526758c9849b35b7f65b78a65fe..4fd551b33c2e3475be03e3b27e66f95550425d1c 100644 (file)
@@ -131,7 +131,7 @@ if(WITH_CYCLES_CUBIN_COMPILER)
        # to be build to compile the cubins.
        if(MSVC AND NOT CMAKE_CL_64)
                message("Building with CUDA not supported on 32 bit, skipped")
        # to be build to compile the cubins.
        if(MSVC AND NOT CMAKE_CL_64)
                message("Building with CUDA not supported on 32 bit, skipped")
-               set(WITH_CYCLES_CUDA_BINARIES OFF)
+               set(WITH_CYCLES_CUDA_BINARIES OFF CACHE BOOL "" FORCE)
        else()
                set(SRC
                        cycles_cubin_cc.cpp
        else()
                set(SRC
                        cycles_cubin_cc.cpp