diff options
| author | bartus | 2019-07-20 12:20:32 +0200 |
|---|---|---|
| committer | bartus | 2019-07-21 09:21:52 +0200 |
| commit | b9567ba8b2ec54fa0f9ba6328334907a0326f4ba (patch) | |
| tree | b572cd0a24c93f5ab3af694bf7531839df893194 /SelectCudaComputeArch.patch | |
| parent | ce2c7cf3d3c02b06f254962be56608823ef4cb9b (diff) | |
| download | aur-b9567ba8b2ec54fa0f9ba6328334907a0326f4ba.tar.gz | |
Filter CUDA_SELECT_NVCC_ARCH_FLAGS
remove "compute_[0-9]+" $$_readable
Diffstat (limited to 'SelectCudaComputeArch.patch')
| -rw-r--r-- | SelectCudaComputeArch.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/SelectCudaComputeArch.patch b/SelectCudaComputeArch.patch index 3fa6c0a12d41..c6b3ffc73d4f 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 5bf681792ca..b975fb5db14 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}") ++ 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: ${CUDA_ARCH_FLAGS_readable})") ++ " archs: ${CYCLES_CUDA_BINARIES_ARCH})") else() message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES") set(WITH_CYCLES_CUDA_BINARIES OFF) |