Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use CMake's CUDA_NVCC_EXECUTABLE rather then own hard coded CYCLES_CUDA variable.

Browse Source
This commit is contained in:
Campbell Barton
2011-10-17 11:54:43 +00:00
parent c18e9a1bc6
commit 97e58e499d
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
intern/cycles/cmake/external_libs.cmake
View File

@@ -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")
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()
endif()
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")
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")
message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA")
set(WITH_CYCLES_CUDA OFF)
endif()
endif()

2
intern/cycles/kernel/CMakeLists.txt
View File

@@ -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)