Skip to content

Commit

Permalink
[embree] Update embree to 3.2.0 (#4065)
Browse files Browse the repository at this point in the history
* Update embree to 3.2.0

* [embree] Use vcpkg_from_github()

* [embree2][embree3] Split embree
  • Loading branch information
doomtr666 authored and ras0219-msft committed Aug 13, 2018
1 parent 0b771de commit e5616ee
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ports/embree/CONTROL → ports/embree2/CONTROL
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: embree
Source: embree2
Version: 2.16.4-2
Description: High Performance Ray Tracing Kernels.
Build-Depends: tbb
13 changes: 7 additions & 6 deletions ports/embree/portfile.cmake → ports/embree2/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/embree-2.16.4)
vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/embree/embree/archive/v2.16.4.zip"
FILENAME "embree-2.16.4.zip"
SHA512 d26d31c7866c072d562dd824af02c90a1bc0302a2765fa6101925956f9b61870e45a4f0a54edae87d07a63aa4687f4244e3e5554491729ea31b617e87d02fb11

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO embree/embree
REF v2.16.4
SHA512 235f7273044c8971eb7f7ecca5f4556d2e75ec958fc10d8861792fdd889a0e1c115bcf45bf6de7c2c44117032af96cd49a252399a2454627dcb82fd943222a01
HEAD_REF devel2
)
vcpkg_extract_source_archive(${ARCHIVE})

file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake)

Expand Down
4 changes: 4 additions & 0 deletions ports/embree3/CONTROL
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Source: embree3
Version: 3.2.0-1
Description: High Performance Ray Tracing Kernels.
Build-Depends: tbb
51 changes: 51 additions & 0 deletions ports/embree3/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
include(vcpkg_common_functions)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO embree/embree
REF v3.2.0
SHA512 296617251e4a9a95a5ceec10ce8f23daf180a8a61fd78bc5782dca7d5b15bddaa0b6f352e47d657a366ef9176a730ef2edc42451fbad8071c5ce8fbfb4515e51
HEAD_REF master
)

file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake)

if(VCPKG_CRT_LINKAGE STREQUAL static)
set(EMBREE_STATIC_RUNTIME ON)
else()
set(EMBREE_STATIC_RUNTIME OFF)
endif()

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA # Disable this option if project cannot be built with Ninja
OPTIONS
-DEMBREE_ISPC_SUPPORT=OFF
-DEMBREE_TUTORIALS=OFF
-DEMBREE_STATIC_RUNTIME=${EMBREE_STATIC_RUNTIME}
"-DTBB_LIBRARIES=TBB::tbb"
"-DTBB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include"
)

# just wait, the release build of embree is insanely slow in MSVC
# a single file will took about 2-10 min
vcpkg_install_cmake()
vcpkg_copy_pdbs()

# these cmake files do not seem to contain helpful configuration for find libs, just remove them
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config.cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config-version.cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/models)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/models)

file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree/doc)

# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/embree)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/embree/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/embree/copyright)

0 comments on commit e5616ee

Please sign in to comment.