From c18e9a1bc6c3712da4ecaa4e49ecf8201993a58e Mon Sep 17 00:00:00 2001 From: Thomas Dinges Date: Mon, 17 Oct 2011 11:24:20 +0000 Subject: Cycles: * Auto detection of CUDA toolkit, using FIND_PACKAGE(CUDA). (Requires at least CMAKE 2.8) --- intern/cycles/cmake/external_libs.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'intern/cycles/cmake') diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 07d45f9dd5d..b6a67a9b86c 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -89,10 +89,15 @@ endif() # CUDA if(WITH_CYCLES_CUDA) - if(WIN32) - set(CYCLES_CUDA "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v4.0" CACHE PATH "Path to CUDA installation") + 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() - set(CYCLES_CUDA "/usr/local/cuda" CACHE PATH "Path to CUDA installation") + 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() 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") -- cgit v1.2.3