diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-10-05 14:08:44 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-10-05 14:47:50 +0300 |
| commit | 55b8fc718a378423cd4b6d93258779e201877b1d (patch) | |
| tree | c2dc2e53ad7678bf4719c77c700c6030fc1c1599 /intern/cycles/cmake/external_libs.cmake | |
| parent | 71cf9f4b3f0b750325a0037c4ef5c43fea71248f (diff) | |
Cycles: improve detection of HIP compiler for buildbot
And fix various broken things in the HIP kernel compilation.
Diffstat (limited to 'intern/cycles/cmake/external_libs.cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index b966edd4298..c1244ab740b 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -521,7 +521,7 @@ endif() 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}") + message(STATUS "Found CUDA ${CUDA_NVCC_EXECUTABLE} (${CUDA_VERSION})") else() message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES") set(WITH_CYCLES_CUDA_BINARIES OFF) @@ -537,6 +537,16 @@ endif() # HIP ########################################################################### +if(WITH_CYCLES_HIP_BINARIES AND WITH_CYCLES_DEVICE_HIP) + find_package(HIP) + if(HIP_FOUND) + message(STATUS "Found HIP ${HIP_HIPCC_EXECUTABLE} (${HIP_VERSION})") + else() + message(STATUS "HIP compiler not found, disabling WITH_CYCLES_HIP_BINARIES") + set(WITH_CYCLES_HIP_BINARIES OFF) + endif() +endif() + if(NOT WITH_HIP_DYNLOAD) set(WITH_HIP_DYNLOAD ON) endif() |