[Bf-blender-cvs] [1fc95d829f9] blender-v3.2-release: CMake: fix error building when CUDA_NVCC_EXECUTABLE is missing
Campbell Barton
noreply at git.blender.org
Tue May 3 10:23:30 CEST 2022
Commit: 1fc95d829f92b81737095a146313131633286b8e
Author: Campbell Barton
Date: Tue May 3 17:50:11 2022 +1000
Branches: blender-v3.2-release
https://developer.blender.org/rB1fc95d829f92b81737095a146313131633286b8e
CMake: fix error building when CUDA_NVCC_EXECUTABLE is missing
===================================================================
M intern/cycles/kernel/CMakeLists.txt
===================================================================
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index c6ac280633b..e33330af029 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -482,19 +482,19 @@ if(WITH_CYCLES_CUDA_BINARIES)
if(DEFINED CUDA10_NVCC_EXECUTABLE)
set(cuda_nvcc_executable ${CUDA10_NVCC_EXECUTABLE})
set(cuda_toolkit_root_dir ${CUDA10_TOOLKIT_ROOT_DIR})
- elseif(${CUDA_VERSION} LESS 110) # Support for sm_30 was removed in CUDA 11
+ elseif("${CUDA_VERSION}" LESS 110) # Support for sm_30 was removed in CUDA 11
set(cuda_nvcc_executable ${CUDA_NVCC_EXECUTABLE})
set(cuda_toolkit_root_dir ${CUDA_TOOLKIT_ROOT_DIR})
else()
message(STATUS "CUDA binaries for ${arch} require CUDA 10 or earlier, skipped.")
endif()
- elseif(${arch} MATCHES ".*_7." AND ${CUDA_VERSION} LESS 100)
+ elseif(${arch} MATCHES ".*_7." AND "${CUDA_VERSION}" LESS 100)
message(STATUS "CUDA binaries for ${arch} require CUDA 10.0+, skipped.")
elseif(${arch} MATCHES ".*_8.")
if(DEFINED CUDA11_NVCC_EXECUTABLE)
set(cuda_nvcc_executable ${CUDA11_NVCC_EXECUTABLE})
set(cuda_toolkit_root_dir ${CUDA11_TOOLKIT_ROOT_DIR})
- elseif(${CUDA_VERSION} GREATER_EQUAL 111) # Support for sm_86 was introduced in CUDA 11
+ elseif("${CUDA_VERSION}" GREATER_EQUAL 111) # Support for sm_86 was introduced in CUDA 11
set(cuda_nvcc_executable ${CUDA_NVCC_EXECUTABLE})
set(cuda_toolkit_root_dir ${CUDA_TOOLKIT_ROOT_DIR})
else()
More information about the Bf-blender-cvs
mailing list