Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[embree3] Fix Embree 3 static compilation patch #17701

Merged
merged 1 commit into from
May 13, 2021
Merged

[embree3] Fix Embree 3 static compilation patch #17701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/embree3/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: embree3
Version: 3.11.0
Port-Version: 1
Port-Version: 2
Homepage: https://github.com/embree/embree
Description: High Performance Ray Tracing Kernels.
Build-Depends: tbb
8 changes: 7 additions & 1 deletion ports/embree3/fix-static-usage.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ diff --git a/common/cmake/embree-config.cmake b/common/cmake/embree-config.cmake
index 14ce929..7e2e8f5 100644
--- a/common/cmake/embree-config.cmake
+++ b/common/cmake/embree-config.cmake
@@ -50,6 +50,16 @@ IF (EMBREE_STATIC_LIB)
@@ -50,6 +50,22 @@ IF (EMBREE_STATIC_LIB)
INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/simd-targets.cmake")
INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/lexers-targets.cmake")
INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/tasking-targets.cmake")
Expand All @@ -15,6 +15,12 @@ index 14ce929..7e2e8f5 100644
+ ENDIF()
+ IF(EMBREE_ISA_AVX2)
+ INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_avx2-targets.cmake")
+ ENDIF()
+ IF(EMBREE_ISA_AVX512KNL)
+ INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_avx512knl-targets.cmake")
+ ENDIF()
+ IF(EMBREE_ISA_AVX512SKX)
+ INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_avx512skx-targets.cmake")
+ ENDIF()
ENDIF()

Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1830,7 +1830,7 @@
},
"embree3": {
"baseline": "3.11.0",
"port-version": 1
"port-version": 2
},
"enet": {
"baseline": "1.3.16",
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/embree3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "955eb7f17ebf475e96ee8fe283b56cbc3944da44",
"version-string": "3.11.0",
"port-version": 2
},
{
"git-tree": "c8355374d128022898e8694462f47103bd730684",
"version-string": "3.11.0",
Expand Down