diff options
| author | Christoph Neuhauser <christoph_neuhauser@web.de> | 2021-05-13 22:33:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-13 13:33:17 -0700 |
| commit | 1c066931af5c582b183fb805370f6cd94f48e822 (patch) | |
| tree | 42ba9c282925882138302365c44149837f97394b | |
| parent | d51426487a1c1dde0d02683540a8730ef5011e1f (diff) | |
| download | vcpkg-1c066931af5c582b183fb805370f6cd94f48e822.tar.gz vcpkg-1c066931af5c582b183fb805370f6cd94f48e822.zip | |
Fixed AVX512KNL and AVX512SKX support for embree3. (#17701)
| -rwxr-xr-x | ports/embree3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/embree3/fix-static-usage.patch | 8 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/e-/embree3.json | 5 |
4 files changed, 14 insertions, 3 deletions
diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL index 1b11e6904..332077fd0 100755 --- a/ports/embree3/CONTROL +++ b/ports/embree3/CONTROL @@ -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 diff --git a/ports/embree3/fix-static-usage.patch b/ports/embree3/fix-static-usage.patch index 7af99df16..2a0d221e4 100644 --- a/ports/embree3/fix-static-usage.patch +++ b/ports/embree3/fix-static-usage.patch @@ -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")
@@ -16,6 +16,12 @@ index 14ce929..7e2e8f5 100644 + 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()
INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree-targets.cmake")
diff --git a/versions/baseline.json b/versions/baseline.json index 81aef238e..bb8324ad4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1834,7 +1834,7 @@ }, "embree3": { "baseline": "3.11.0", - "port-version": 1 + "port-version": 2 }, "enet": { "baseline": "1.3.16", diff --git a/versions/e-/embree3.json b/versions/e-/embree3.json index 0c66449e6..6b172e934 100644 --- a/versions/e-/embree3.json +++ b/versions/e-/embree3.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "955eb7f17ebf475e96ee8fe283b56cbc3944da44", + "version-string": "3.11.0", + "port-version": 2 + }, + { "git-tree": "c8355374d128022898e8694462f47103bd730684", "version-string": "3.11.0", "port-version": 1 |