summarylogtreecommitdiffstats
path: root/SelectCudaComputeArch.patch
diff options
context:
space:
mode:
authorbartus2019-11-16 21:22:54 +0100
committerbartus2019-11-16 22:38:26 +0100
commit048b7b6f4b0fb4f22215a7176b224a80d5be5339 (patch)
treea66874c5ce702fdfddda375b0b7e7444ca01d728 /SelectCudaComputeArch.patch
parenta22b04c5d9a15e57602a3a229654edfcf049744f (diff)
downloadaur-048b7b6f4b0fb4f22215a7176b224a80d5be5339.tar.gz
Fix SelectCudaComputeArch, drop cuda from makedepends.
Diffstat (limited to 'SelectCudaComputeArch.patch')
-rw-r--r--SelectCudaComputeArch.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/SelectCudaComputeArch.patch b/SelectCudaComputeArch.patch
index 8b129acc07f..ab63fd12849 100644
--- a/SelectCudaComputeArch.patch
+++ b/SelectCudaComputeArch.patch
@@ -2,14 +2,15 @@ diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/exter
index d0f473a2939..90fcb40107a 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
-@@ -41,6 +41,10 @@ if(WITH_CYCLES_CUDA_BINARIES OR NOT WITH_CUDA_DYNLOAD)
+@@ -41,6 +41,11 @@ if(WITH_CYCLES_CUDA_BINARIES OR NOT WITH_CUDA_DYNLOAD)
find_package(CUDA) # Try to auto locate CUDA toolkit
if(CUDA_FOUND)
message(STATUS "CUDA nvcc = ${CUDA_NVCC_EXECUTABLE}")
+ CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS Auto)
-+ set(CYCLES_CUDA_BINARIES_ARCH "${CUDA_ARCH_FLAGS_readable}")
-+ message(STATUS "Enabling CUDA support (version: ${CUDA_VERSION_STRING},"
-+ " archs: ${CUDA_ARCH_FLAGS_readable})")
++ string(REGEX REPLACE " compute_[0-9]+" "" CYCLES_CUDA_BINARIES_ARCH "${CUDA_ARCH_FLAGS_readable}")
++ string(REGEX REPLACE " " ";" CYCLES_CUDA_BINARIES_ARCH "${CYCLES_CUDA_BINARIES_ARCH}")
++ message(STATUS "Enabling CUDA support (version: ${CUDA_VERSION_STRING},"
++ " archs: ${CYCLES_CUDA_BINARIES_ARCH})")
else()
message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES")
set(WITH_CYCLES_CUDA_BINARIES OFF)