blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 767 Projects 19 Wiki Activity

WIP: Build: Shared Libraries Not Included in Buildtime Platform Vars #115790

Closed
Jeroen Bakker wants to merge 3 commits from Jeroen-Bakker:platform/fix-sycl-bundled-libraries into main
pull from: Jeroen-Bakker:platform/fix-sycl-bundled-libraries
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 5 Commits 3 Files Changed 2 +2
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build_files/cmake/platform/platform_unix.cmake
View File

@ -383,6 +383,7 @@ if(DEFINED LIBDIR)
list(FILTER _sycl_runtime_libraries EXCLUDE REGEX ".*\.py")
list(REMOVE_ITEM _sycl_runtime_libraries "${SYCL_ROOT_DIR}/lib/libpi_opencl.so")
list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries})
list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${SYCL_ROOT_DIR}/lib/)
unset(_sycl_runtime_libraries)
endif()

1
build_files/cmake/platform/platform_win32.cmake
View File

@ -1195,6 +1195,7 @@ if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_
unset(_sycl_pi_runtime_libraries_glob)
list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries})
list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${SYCL_ROOT_DIR/bin/})
Jeroen Bakker commented 2023-12-05 12:51:30 +01:00
Review
Copy Link

Windows uses a different approach need to adjust it in PLATFORM_ENV_BUILD_DIRS directly.

Windows uses a different approach need to adjust it in PLATFORM_ENV_BUILD_DIRS directly.
unset(_sycl_runtime_libraries)
set(SYCL_LIBRARIES optimized ${SYCL_LIBRARY} debug ${SYCL_LIBRARY_DEBUG})