[Bf-blender-cvs] [f0505b2791e] cycles_oneapi: deps_builder: fix dpcpp build on linux
Ray Molenkamp
noreply at git.blender.org
Sun May 22 22:50:49 CEST 2022
Commit: f0505b2791ecbf047e980ec421c5dd50a6968515
Author: Ray Molenkamp
Date: Sun May 22 14:50:42 2022 -0600
Branches: cycles_oneapi
https://developer.blender.org/rBf0505b2791ecbf047e980ec421c5dd50a6968515
deps_builder: fix dpcpp build on linux
===================================================================
M build_files/build_environment/cmake/dpcpp.cmake
M build_files/build_environment/cmake/options.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/dpcpp.cmake b/build_files/build_environment/cmake/dpcpp.cmake
index 38987dd8709..ecf6ae384b1 100644
--- a/build_files/build_environment/cmake/dpcpp.cmake
+++ b/build_files/build_environment/cmake/dpcpp.cmake
@@ -31,7 +31,7 @@ set(DPCPP_EXTRA_ARGS
-DOpenCL_HEADERS=file://${PACKAGE_DIR}/${OPENCLHEADERS_FILE}
-DOpenCL_LIBRARY_SRC=file://${PACKAGE_DIR}/${ICDLOADER_FILE}
-DBOOST_MP11_SOURCE_DIR=${BUILD_DIR}/mp11/src/external_mp11/
- -DLEVEL_ZERO_LIBRARY=${LIBDIR}/level-zero/lib/ze_loader${LIBEXT}
+ -DLEVEL_ZERO_LIBRARY=${LIBDIR}/level-zero/lib/${LIBPREFIX}ze_loader${SHAREDLIBEXT}
-DLEVEL_ZERO_INCLUDE_DIR=${LIBDIR}/level-zero/include
-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${BUILD_DIR}/spirvheaders/src/external_spirvheaders/
# Below here is copied from an invocation of buildbot/config.py
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 7b9529068f4..9015ef9ac7c 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -38,6 +38,7 @@ message("BUILD_DIR = ${BUILD_DIR}")
if(WIN32)
set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
set(LIBEXT ".lib")
+ set(SHAREDLIBEXT ".lib")
set(LIBPREFIX "")
# For OIIO and OSL
@@ -96,6 +97,7 @@ if(WIN32)
else()
set(PATCH_CMD patch)
set(LIBEXT ".a")
+ set(SHAREDLIBEXT ".so")
set(LIBPREFIX "lib")
if(APPLE)
More information about the Bf-blender-cvs
mailing list