leesonw/blender-cluster
0
0
Fork 0
forked from blender/blender
Code Pull Requests 2 Activity

Merge latest distributed renderering changes from GHE master-cluster into master-cluster on blender.org #1

Merged
William Leeson merged 13 commits from master-cluster_sync_from_ghe_patch into master-cluster 2023-03-31 17:26:02 +02:00
Conversation 0 Commits 13 Files Changed 77 +7 -1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 44f43e229e - Show all commits

8
intern/cycles/app/headless_light_client/CMakeLists.txt
View File

@ -12,6 +12,7 @@ set(INC
../../cluster_rendering/libcluster/compression # for nv_encoder ../../cluster_rendering/libcluster/compression # for nv_encoder
../../cluster_rendering/libnetwork ../../cluster_rendering/libnetwork
${NVCODEC_PUBLIC_INTERFACE_DIR} ${NVCODEC_PUBLIC_INTERFACE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
) )
set(INC_SYS set(INC_SYS
@ -36,9 +37,14 @@ set(LIBRARIES
${WEBP_LIBRARIES} ${WEBP_LIBRARIES}
${Boost_LIBRARIES} ${Boost_LIBRARIES}
${GLOG_LIBRARIES} ${GLOG_LIBRARIES}
bf_intern_libc_compat
) )
if(UNIX AND NOT APPLE)
list(APPEND LIB
bf_intern_libc_compat
)
endif()
if(WITH_CYCLES_DEVICE_CUDA AND CUDA_INCLUDE_DIRS AND UNIX) if(WITH_CYCLES_DEVICE_CUDA AND CUDA_INCLUDE_DIRS AND UNIX)
if(NOT DEFINED NVENCODEAPI_LIB) if(NOT DEFINED NVENCODEAPI_LIB)
find_library(NVENCODEAPI_LIB nvidia-encode) find_library(NVENCODEAPI_LIB nvidia-encode)