diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-09-05 02:00:44 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-09-05 02:00:44 +0300 |
| commit | 54ea26f019f24c9fef5693368f46d38198ca411e (patch) | |
| tree | 75e517608954e3d2ecbafeabd0a7926bc9ca820a | |
| parent | e1a4d58ecc23a53434e8de73f1b19fa9baf6bca8 (diff) | |
| parent | 19c7e499e19aadc7d6d7831bd6924de568cd957d (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index 936da0075fe..5c2bff96411 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -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 |