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>2018-11-08 05:34:49 +0300
committerRay Molenkamp <github@lazydodo.com>2018-11-08 05:34:49 +0300
commit406f36f5742468fe57aed9ba5537c59faa6d079a (patch)
tree7f6fedc3a1f77adde50783c46e24396826c36266 /build_files
parentd3b11de7d6d777ace9f5b8a3626dd2b1fde095aa (diff)
build: add proper embree support to platform_win32.cmake
made the use of findpackage optional and add support for debug builds
Diffstat (limited to 'build_files')
-rw-r--r--build_files/cmake/platform/platform_win32.cmake25
1 files changed, 24 insertions, 1 deletions
diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index 1bf04689971..d5d0b03d505 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -609,7 +609,30 @@ if(WITH_CYCLES_OSL)
endif()
if(WITH_CYCLES_EMBREE)
- find_package(Embree 3.2.4 REQUIRED)
+ windows_find_package(Embree)
+ if(NOT EMBREE_FOUND)
+ set(EMBREE_INCLUDE_DIRS ${LIBDIR}/embree/include)
+ set(EMBREE_LIBRARIES
+ optimized ${LIBDIR}/embree/lib/embree3.lib
+ optimized ${LIBDIR}/embree/lib/embree_avx2.lib
+ optimized ${LIBDIR}/embree/lib/embree_avx.lib
+ optimized ${LIBDIR}/embree/lib/embree_sse42.lib
+ optimized ${LIBDIR}/embree/lib/lexers.lib
+ optimized ${LIBDIR}/embree/lib/math.lib
+ optimized ${LIBDIR}/embree/lib/simd.lib
+ optimized ${LIBDIR}/embree/lib/sys.lib
+ optimized ${LIBDIR}/embree/lib/tasking.lib
+
+ debug ${LIBDIR}/embree/lib/embree3_d.lib
+ debug ${LIBDIR}/embree/lib/embree_avx2_d.lib
+ debug ${LIBDIR}/embree/lib/embree_avx_d.lib
+ debug ${LIBDIR}/embree/lib/embree_sse42_d.lib
+ debug ${LIBDIR}/embree/lib/lexers_d.lib
+ debug ${LIBDIR}/embree/lib/math_d.lib
+ debug ${LIBDIR}/embree/lib/simd_d.lib
+ debug ${LIBDIR}/embree/lib/sys_d.lib
+ debug ${LIBDIR}/embree/lib/tasking_d.lib)
+ endif()
endif()
if (WINDOWS_PYTHON_DEBUG)