intern/cycles/app/headless_light_client/CMakeLists.txt

@@ -39,7 +39,7 @@ set(LIBRARIES
   bf_intern_libc_compat
 )
 
-if(WITH_CYCLES_DEVICE_CUDA AND CUDA_INCLUDE_DIRS AND UNIX)
+if(WITH_CYCLES_DEVICE_CUDA AND UNIX)
   if(NOT DEFINED NVENCODEAPI_LIB)
     find_library(NVENCODEAPI_LIB nvidia-encode)
     find_library(NVCUVID_LIB nvcuvid HINTS "/lib64/") # the same folder on dev laptop and docker image
@@ -61,6 +61,26 @@ if(WITH_CYCLES_DEVICE_CUDA AND CUDA_INCLUDE_DIRS AND UNIX)
   endif()
 endif()
 
+# Only use cuew if CUDA_CUDA_LIBRARY not sepcified
+if(WITH_CUDA_DYNLOAD AND NOT CUDA_CUDA_LIBRARY)
+  list(APPEND INC
+    ../../../../extern/cuew/include
+    )
+  list(APPEND LIBRARIES
+      extern_cuew
+    )
+  add_definitions(-DWITH_CUDA_DYNLOAD)
+else()
+  list(APPEND INC
+    ${CUDA_TOOLKIT_INCLUDE}
+    )
+  list(APPEND LIBRARIES
+      ${CUDA_CUDA_LIBRARY}
+    )
+  remove_definitions(-DWITH_CUDA_DYNLOAD)
+endif()
+list(APPEND LIBRARIES ${CMAKE_DL_LIBS})
+
 include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 

intern/cycles/cluster_rendering/libcluster/CMakeLists.txt

@@ -168,7 +168,7 @@ if(WITH_CYCLES_DEVICE_OPTIX)
   list(APPEND INC ${OPTIX_INCLUDE_DIRS})
 endif()
 
-if(WITH_CYCLES_DEVICE_CUDA AND CUDA_INCLUDE_DIRS AND UNIX)
+if(WITH_CYCLES_DEVICE_CUDA AND UNIX)
   message(STATUS "Building with CUDA, adding nv_encoder to the libcluster")
   find_library(NVENCODEAPI_LIB nvidia-encode)
   find_library(NVCUVID_LIB nvcuvid HINTS "/lib64/") # the same folder on dev laptop and docker image