diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-24 14:44:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-24 14:44:04 +0400 |
| commit | 48b4de31521501203c39fc7efa9aca7d018b6a1c (patch) | |
| tree | 31a05c15bc56321652912fb1eef9070cd17f8ec4 /intern/cycles/cmake | |
| parent | 29bdf37f9d1a5a45b98aeed15d415df27050615b (diff) | |
Cycles:
* auto/fixed threads option is used now, patch by Thomas.
* remove unused CUDA_LIBRARIES, library is dynamically loaded
* fix mesh XML export operator for API update
Diffstat (limited to 'intern/cycles/cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 01f3cc1af0d..b23e3b292c5 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -94,13 +94,11 @@ if(WITH_CYCLES_CUDA) set(CYCLES_CUDA_ARCH sm_10 sm_11 sm_12 sm_13 sm_20 sm_21 CACHE STRING "CUDA architectures to build for") set(CYCLES_CUDA_MAXREG 24 CACHE STRING "CUDA maximum number of register to use") - find_library(CUDA_LIBRARIES NAMES cuda PATHS ${CYCLES_CUDA}/lib ${CYCLES_CUDA}/lib/Win32 NO_DEFAULT_PATH) find_path(CUDA_INCLUDES cuda.h ${CYCLES_CUDA}/include NO_DEFAULT_PATH) find_program(CUDA_NVCC NAMES nvcc PATHS ${CYCLES_CUDA}/bin NO_DEFAULT_PATH) - if(CUDA_INCLUDES AND CUDA_LIBRARIES AND CUDA_NVCC) + if(CUDA_INCLUDES AND CUDA_NVCC) message(STATUS "CUDA includes = ${CUDA_INCLUDES}") - message(STATUS "CUDA library = ${CUDA_LIBRARIES}") message(STATUS "CUDA nvcc = ${CUDA_NVCC}") else() message(STATUS "CUDA not found") |