From 1937f3b8dec03af2390dc98ec6fcdc128bdd3732 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Tue, 22 May 2012 12:30:37 +0000 Subject: Disable building of CUDA 1.3 kernels for cycles for win32 cmake and mingw32 scons. They were already disabled for scons MSVC 32bit. --- CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f86aa0d7f2..5632d211415 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -238,8 +238,14 @@ mark_as_advanced(WITH_MINGW64) option(WITH_CYCLES "Enable cycles Render Engine" ON) option(WITH_CYCLES_TEST "Build cycles test application" OFF) option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF) -set(CYCLES_CUDA_BINARIES_ARCH sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build binaries for") +if(WIN32 AND NOT CMAKE_CL_64 AND NOT WITH_MINGW64) + set(PLATFORM_DEFAULT sm_20 sm_21) +else() + set(PLATFORM_DEFAULT sm_13 sm_20 sm_21) +endif() +set(CYCLES_CUDA_BINARIES_ARCH ${PLATFORM_DEFAULT} CACHE STRING "CUDA architectures to build binaries for") mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH) +unset(PLATFORM_DEFAULT) # disable for now, but plan to support on all platforms eventually option(WITH_MEM_JEMALLOC "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF) -- cgit v1.2.3