Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Molenkamp <github@lazydodo.com>2020-06-14 20:09:32 +0300
committerRay Molenkamp <github@lazydodo.com>2020-06-14 20:09:32 +0300
commit4155f8dc21a99be61e5dc53ff950c8c72a4ba9c1 (patch)
tree9cc5426355d36a60ccb168acbd95ebe6eef24fe3 /build_files/build_environment/cmake
parent9464260ed786c7cd76d6c9c83590a3b13407fdcd (diff)
deps/windows/embree: Prevent exports leaking out of blender binary
embree marks a few of its functions with a dll_export macro forcibly exporting these symbols from whatever binary links them. Given we link embree statically and we do not want these exports in the blender binary, the macro needs to be a no-op.
Diffstat (limited to 'build_files/build_environment/cmake')
-rw-r--r--build_files/build_environment/cmake/embree.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/embree.cmake b/build_files/build_environment/cmake/embree.cmake
index 428451d0115..66a86cd5dbd 100644
--- a/build_files/build_environment/cmake/embree.cmake
+++ b/build_files/build_environment/cmake/embree.cmake
@@ -51,6 +51,7 @@ ExternalProject_Add(external_embree
DOWNLOAD_DIR ${DOWNLOAD_DIR}
URL_HASH MD5=${EMBREE_HASH}
PREFIX ${BUILD_DIR}/embree
+ PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/embree/src/external_embree < ${PATCH_DIR}/embree.diff
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
INSTALL_DIR ${LIBDIR}/embree
)