Merge remote-tracking branch 'origin/master' into blender2.8
authorRay Molenkamp <github@lazydodo.com>
Tue, 4 Sep 2018 23:00:44 +0000 (17:00 -0600)
committerRay Molenkamp <github@lazydodo.com>
Tue, 4 Sep 2018 23:00:44 +0000 (17:00 -0600)
intern/cycles/app/CMakeLists.txt

index 936da0075fe48f1b81eb2ba9cbc12ff424f4266b..5c2bff96411fc4f51ea8a182a62cd8936ad6755d 100644 (file)
@@ -134,7 +134,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")
-               set(WITH_CYCLES_CUDA_BINARIES OFF)
+               set(WITH_CYCLES_CUDA_BINARIES OFF CACHE BOOL "" FORCE)
        else()
                set(SRC
                        cycles_cubin_cc.cpp