diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-08 17:13:43 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-11-08 17:15:29 +0300 |
| commit | 146b39a45d4ad1b36a977d19984797f984f161ec (patch) | |
| tree | c44be89db5b92c2ca5328933b3a1e6f891f77dbd /build_files/cmake | |
| parent | 3cf724209f619071555c1acce5958a13a11103e5 (diff) | |
| parent | 116be3deffc087a61cdab452cd17bcaaf049a508 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 25 |
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 51cc4b2fd34..8c3ddefa68e 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -608,7 +608,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) |