From c341dd0585b73a0526573c085e6d265b0daf6738 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 14 Feb 2018 10:20:26 +0100 Subject: CMake: Fix cimpilation error when CUDA dynload is disabled but toolkit is not installed --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index c0a0b4bd27f..f5b80efef85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -744,6 +744,15 @@ if(WITH_AUDASPACE) endif() endif() +# Auto-enable CUDA dynload if toolkit is not found. +if(NOT WITH_CUDA_DYNLOAD) + find_package(CUDA) + if (NOT CUDA_FOUND) + message("CUDA toolkit not found, using dynamic runtime loading of libraries instead") + set(WITH_CUDA_DYNLOAD ON) + endif() +endif() + #----------------------------------------------------------------------------- # Check for valid directories # ... a partial checkout may cause this. -- cgit v1.2.3 From a966852362bbeffab9e8b297da2d75bf53e69051 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 14 Feb 2018 10:31:04 +0100 Subject: CMake: Expose Cycles devices support as CMake option Handy to disable GPU based devices when it's needed to run Valgrind. --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index f5b80efef85..5b2bd2fd460 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -420,6 +420,13 @@ mark_as_advanced(WITH_CYCLES_LOGGING) mark_as_advanced(WITH_CYCLES_DEBUG) mark_as_advanced(WITH_CYCLES_NATIVE_ONLY) +option(WITH_CYCLES_DEVICE_CUDA "Enable Cycles CUDA compute support" ON) +option(WITH_CYCLES_DEVICE_OPENCL "Enable Cycles OpenCL compute support" ON) +option(WITH_CYCLES_NETWORK "Enable Cycles compute over network support (EXPERIMENTAL and unfinished)" OFF) +mark_as_advanced(WITH_CYCLES_DEVICE_CUDA) +mark_as_advanced(WITH_CYCLES_DEVICE_OPENCL) +mark_as_advanced(WITH_CYCLES_NETWORK) + option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at runtime" ON) mark_as_advanced(WITH_CUDA_DYNLOAD) -- cgit v1.2.3