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 +26 -14
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b32b73f05b - Show all commits

40
intern/cycles/cluster_rendering/libcluster/CMakeLists.txt
View File

@ -76,20 +76,32 @@ set(FLAT_BUFFER_FILES
function(FLATBUFFERS_GENERATE_C_HEADERS Name) function(FLATBUFFERS_GENERATE_C_HEADERS Name)
if(NOT FLATBUFFERS_FLATC_EXECUTABLE) if(NOT FLATBUFFERS_FLATC_EXECUTABLE)
set(FLATBUFFERS_FLATC_EXECUTABLE $<TARGET_FILE:flatc>) set(FLATBUFFERS_FLATC_EXECUTABLE $<TARGET_FILE:flatc>)
if(NOT WIN32) # if(NOT WIN32)
set(FLATBUFFERS_FLATC_EXECUTABLE ${CMAKE_BINARY_DIR}/bin/flatc) # #if(APPLE)
message(WARNING "Using flatc binary FLATBUFFERS_FLATC_EXECUTABLE") # # There seems to be a bug on Windows that when the CMAKE_BUILD_TYPE is undefined the
else() # # CMAKE_BUILD_TYPE_INIT is set to "Debug" when it should be "Release"
# There seems to be a bug on Windows that when the CMAKE_BUILD_TYPE is undefined the # message("Foo is located at:${CONFIG}")
# CMAKE_BUILD_TYPE_INIT is set to "Debug" when it should be "Release" # # if($<CONFIG:Debug>)
message("Foo is located at:${CONFIG}") # set(FLATBUFFERS_FLATC_EXECUTABLE $<TARGET_FILE:flatc>) # ${CMAKE_BINARY_DIR}/bin/Debug/flatc)
# if($<CONFIG:Debug>) # #else()
set(FLATBUFFERS_FLATC_EXECUTABLE $<TARGET_FILE:flatc>) # ${CMAKE_BINARY_DIR}/bin/Debug/flatc.exe) # # set(FLATBUFFERS_FLATC_EXECUTABLE ${CMAKE_BINARY_DIR}/bin/Release/flatc)
#else() # #endif()
# set(FLATBUFFERS_FLATC_EXECUTABLE ${CMAKE_BINARY_DIR}/bin/Release/flatc.exe) # message(WARNING "Using MacOS flatc binary:${FLATBUFFERS_FLATC_EXECUTABLE}")
#endif() # #else()
message(WARNING "Using Windows flatc binary:${FLATBUFFERS_FLATC_EXECUTABLE} for build type:${CMAKE_BUILD_TYPE} ${CMAKE_BUILD_TYPE_INIT}") # set(FLATBUFFERS_FLATC_EXECUTABLE ${CMAKE_BINARY_DIR}/bin/flatc)
endif() # message(WARNING "Using flatc binary FLATBUFFERS_FLATC_EXECUTABLE")
# #endif()
# else()
# # There seems to be a bug on Windows that when the CMAKE_BUILD_TYPE is undefined the
# # CMAKE_BUILD_TYPE_INIT is set to "Debug" when it should be "Release"
# message("Foo is located at:${CONFIG}")
# # if($<CONFIG:Debug>)
# set(FLATBUFFERS_FLATC_EXECUTABLE $<TARGET_FILE:flatc>) # ${CMAKE_BINARY_DIR}/bin/Debug/flatc.exe)
# #else()
# # set(FLATBUFFERS_FLATC_EXECUTABLE ${CMAKE_BINARY_DIR}/bin/Release/flatc.exe)
# #endif()
# message(WARNING "Using Windows flatc binary:${FLATBUFFERS_FLATC_EXECUTABLE} for build type:${CMAKE_BUILD_TYPE} ${CMAKE_BUILD_TYPE_INIT}")
# endif()
endif() endif()
set(FLATC_OUTPUTS) set(FLATC_OUTPUTS)
foreach(FILE ${ARGN}) foreach(FILE ${ARGN})