[Bf-blender-cvs] [f99b7725895] cycles_oneapi: Build Deps: Fix compilation of DPC++ on a fresh Windows
Sergey Sharybin
noreply at git.blender.org
Mon Jun 20 17:46:29 CEST 2022
Commit: f99b77258954008aae207e2e2d2e7d188dc8e674
Author: Sergey Sharybin
Date: Mon Jun 20 17:43:13 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rBf99b77258954008aae207e2e2d2e7d188dc8e674
Build Deps: Fix compilation of DPC++ on a fresh Windows
Point DPC++ and vcintrinsics to the self-compiled Python.
===================================================================
M build_files/build_environment/cmake/dpcpp.cmake
===================================================================
diff --git a/build_files/build_environment/cmake/dpcpp.cmake b/build_files/build_environment/cmake/dpcpp.cmake
index 12f39c4053e..586bef16b13 100644
--- a/build_files/build_environment/cmake/dpcpp.cmake
+++ b/build_files/build_environment/cmake/dpcpp.cmake
@@ -60,8 +60,15 @@ set(DPCPP_EXTRA_ARGS
-DSYCL_CLANG_EXTRA_FLAGS=
-DSYCL_ENABLE_PLUGINS=level_zero
-DCMAKE_INSTALL_RPATH=\$ORIGIN
+ -DPython3_ROOT_DIR=${LIBDIR}/python/
+ -DPython3_EXECUTABLE=${PYTHON_BINARY}
+ -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
)
+if(WIN32)
+ list(APPEND DPCPP_EXTRA_ARGS -DPython3_FIND_REGISTRY=NEVER)
+endif()
+
ExternalProject_Add(external_dpcpp
URL file://${PACKAGE_DIR}/${DPCPP_FILE}
DOWNLOAD_DIR ${DOWNLOAD_DIR}
More information about the Bf-blender-cvs
mailing list