diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-18 14:33:05 +0300 |
| commit | 2bc952fdb6e1474e9e568224a37bcf5cff874aaf (patch) | |
| tree | 8d7c3a99896415392035ba350a606d350b6d5e37 /intern/cycles/app | |
| parent | 5d3f679013bbbb9f0c7aae47b5653c54266cf7ca (diff) | |
| parent | 7ff3cd26932cbc93068eea4dc7438442216e4ee1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt index a8e0297aeaa..d1f86a5fe7d 100644 --- a/intern/cycles/app/CMakeLists.txt +++ b/intern/cycles/app/CMakeLists.txt @@ -126,7 +126,8 @@ if(WITH_CYCLES_CUBIN_COMPILER) # though we are building 32 bit blender a 64 bit cubin_cc will have # to be build to compile the cubins. if(MSVC AND NOT CMAKE_CL_64) - Message("cycles_cubin_cc not supported on x86") + message("Building with CUDA not supported on 32 bit, skipped") + set(WITH_CYCLES_CUDA_BINARIES OFF) else() set(SRC cycles_cubin_cc.cpp |