-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[embree] Update embree to 3.2.0 (#4065)
* Update embree to 3.2.0 * [embree] Use vcpkg_from_github() * [embree2][embree3] Split embree
- Loading branch information
1 parent
0b771de
commit e5616ee
Showing
4 changed files
with
63 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |