diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-17 15:54:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-17 15:54:43 +0400 |
| commit | 97e58e499d8969b344333449514499cf1f5fdfce (patch) | |
| tree | b6ddb86923d7ecddaa67184ec1f4a4ae37bb63f5 /intern/cycles | |
| parent | c18e9a1bc6c3712da4ecaa4e49ecf8201993a58e (diff) | |
use CMake's CUDA_NVCC_EXECUTABLE rather then own hard coded CYCLES_CUDA variable.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 26 | ||||
| -rw-r--r-- | intern/cycles/kernel/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 20 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index b6a67a9b86c..0915d4d92c8 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -82,33 +82,21 @@ if(WITH_CYCLES_BLENDER) ${CMAKE_SOURCE_DIR}/source/blender/blenloader ${CMAKE_BINARY_DIR}/source/blender/makesrna/intern) - ADD_DEFINITIONS(-DBLENDER_PLUGIN) + add_definitions(-DBLENDER_PLUGIN) endif() ########################################################################### # CUDA if(WITH_CYCLES_CUDA) - FIND_PACKAGE(CUDA) # Try to auto locate CUDA toolkit + find_package(CUDA) # Try to auto locate CUDA toolkit if(CUDA_FOUND) - set(CYCLES_CUDA ${CUDA_TOOLKIT_ROOT_DIR} CACHE PATH "Path to CUDA installation") + message(STATUS "CUDA nvcc = ${CUDA_NVCC_EXECUTABLE}") + 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") else() - if(WIN32) - set(CYCLES_CUDA "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v4.0" CACHE PATH "Path to CUDA installation") - else() - set(CYCLES_CUDA "/usr/local/cuda" CACHE PATH "Path to CUDA installation") - endif() + message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA") + set(WITH_CYCLES_CUDA OFF) endif() - 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_program(CUDA_NVCC NAMES nvcc PATHS ${CYCLES_CUDA}/bin NO_DEFAULT_PATH) - - if(CUDA_NVCC) - message(STATUS "CUDA nvcc = ${CUDA_NVCC}") - else() - message(STATUS "CUDA compiler not found") - endif() - endif() diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 9714f941082..cf10f035585 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -95,7 +95,7 @@ if(WITH_CYCLES_CUDA) add_custom_command( OUTPUT ${cuda_cubin} - COMMAND ${CUDA_NVCC} -arch=${arch} -m${CUDA_BITS} --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu --use_fast_math -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v" --maxrregcount=${CYCLES_CUDA_MAXREG} --opencc-options -OPT:Olimit=0 -I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/svm -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC + COMMAND ${CUDA_NVCC_EXECUTABLE} -arch=${arch} -m${CUDA_BITS} --cubin ${CMAKE_CURRENT_SOURCE_DIR}/kernel.cu --use_fast_math -o ${CMAKE_CURRENT_BINARY_DIR}/${cuda_cubin} --ptxas-options="-v" --maxrregcount=${CYCLES_CUDA_MAXREG} --opencc-options -OPT:Olimit=0 -I${CMAKE_CURRENT_SOURCE_DIR}/../util -I${CMAKE_CURRENT_SOURCE_DIR}/svm -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END= -DNVCC DEPENDS ${cuda_sources}) delayed_install("${CMAKE_CURRENT_BINARY_DIR}" "${cuda_cubin}" ${CYCLES_INSTALL_PATH}/lib) |