From 26e8a8cf153abbe8aca92e78109004a5dc83a895 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 5 Dec 2023 10:55:25 +0100 Subject: [PATCH 1/3] Build: Sycl Not Included in Buildtime Platform Vars When building on Linux the Sycl libraries could not be found when using the PLATORM_ENV_BUILD* variables. Cause: Sycl library under Linux uses a custom way of bundling its libraries. This updated the PLATFORM_BUNDLED_LIBRARIES, but didn't update PLATFORM_BUNDLED_LIBRARY_DIRS. PLATFORM_BUNDLIED_LIBRARY_DIRS is used to populate PLATFORM_ENV_BUILD_DIRS and PLATFORM_ENV_BUILD. --- build_files/cmake/platform/platform_unix.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 46786a48970..5151f922350 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -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() -- 2.30.2 From 19c3e789ac39664f54f317b60b23080c24b72d04 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 5 Dec 2023 12:40:55 +0100 Subject: [PATCH 2/3] Add windows --- build_files/cmake/platform/platform_win32.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index 03895918e16..d3e9de513df 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -1194,6 +1194,7 @@ if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_ list(APPEND _sycl_runtime_libraries ${_sycl_pi_runtime_libraries_glob}) unset(_sycl_pi_runtime_libraries_glob) + list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${SYCL_ROOT_DIR/bin/}) list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries}) unset(_sycl_runtime_libraries) -- 2.30.2 From 662718acdfee77b846406b13091aa635f8d134c9 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Tue, 5 Dec 2023 12:42:01 +0100 Subject: [PATCH 3/3] Use same style as linux --- build_files/cmake/platform/platform_win32.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index d3e9de513df..3ac570b0f5e 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -1194,8 +1194,8 @@ if(WITH_CYCLES AND (WITH_CYCLES_DEVICE_ONEAPI OR (WITH_CYCLES_EMBREE AND EMBREE_ list(APPEND _sycl_runtime_libraries ${_sycl_pi_runtime_libraries_glob}) unset(_sycl_pi_runtime_libraries_glob) - list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${SYCL_ROOT_DIR/bin/}) list(APPEND PLATFORM_BUNDLED_LIBRARIES ${_sycl_runtime_libraries}) + list(APPEND PLATFORM_BUNDLED_LIBRARY_DIRS ${SYCL_ROOT_DIR/bin/}) unset(_sycl_runtime_libraries) set(SYCL_LIBRARIES optimized ${SYCL_LIBRARY} debug ${SYCL_LIBRARY_DEBUG}) -- 2.30.2