[Bf-blender-cvs] [9ef12c68ee2] cycles_oneapi: Cycles oneAPI: Fix clang headers used from DPCPP folder

Sergey Sharybin noreply at git.blender.org
Tue Jun 21 12:39:47 CEST 2022


Commit: 9ef12c68ee22f2ba255b78c424591a52205f2ce3
Author: Sergey Sharybin
Date:   Tue Jun 21 12:39:18 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB9ef12c68ee22f2ba255b78c424591a52205f2ce3

Cycles oneAPI: Fix clang headers used from DPCPP folder

===================================================================

M	build_files/cmake/platform/platform_unix.cmake

===================================================================

diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 90d21463f0e..03a002a7ff4 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -38,9 +38,15 @@ if(EXISTS ${LIBDIR})
   message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
 
   file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
+
   # Ignore Mesa software OpenGL libraries, they are not intended to be
   # linked against but to optionally override at runtime.
   list(REMOVE_ITEM LIB_SUBDIRS ${LIBDIR}/mesa)
+
+  # Ignore DPC++ as it contains its own copy of LLVM/CLang which we do
+  # not need to be ever discovered for the Blender linking.
+  list(REMOVE_ITEM LIB_SUBDIRS ${LIBDIR}/dpcpp)
+
   # NOTE: Make sure "proper" compiled zlib comes first before the one
   # which is a part of OpenCollada. They have different ABI, and we
   # do need to use the official one.



More information about the Bf-blender-cvs mailing list