diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-08-29 06:37:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 15:37:42 -0700 |
| commit | 29501ce464d63537b513365ee74f18f4a624aea0 (patch) | |
| tree | 4032c1e358046956f3db7b1919fef133010b883c | |
| parent | 5cb765aebe8644b92be0e64de6b6eb56f355c944 (diff) | |
| download | vcpkg-29501ce464d63537b513365ee74f18f4a624aea0.tar.gz vcpkg-29501ce464d63537b513365ee74f18f4a624aea0.zip | |
[embree3] Fix usage in static build (#13182)
| -rwxr-xr-x | ports/embree3/CONTROL | 1 | ||||
| -rw-r--r-- | ports/embree3/fix-static-usage.patch | 21 | ||||
| -rwxr-xr-x | ports/embree3/portfile.cmake | 3 |
3 files changed, 24 insertions, 1 deletions
diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL index 824e892e6..1b11e6904 100755 --- a/ports/embree3/CONTROL +++ b/ports/embree3/CONTROL @@ -1,5 +1,6 @@ Source: embree3 Version: 3.11.0 +Port-Version: 1 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 new file mode 100644 index 000000000..7af99df16 --- /dev/null +++ b/ports/embree3/fix-static-usage.patch @@ -0,0 +1,21 @@ +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)
+ 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")
++
++ IF(EMBREE_ISA_SSE42)
++ INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_sse42-targets.cmake")
++ ENDIF()
++ IF(EMBREE_ISA_AVX)
++ INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_avx-targets.cmake")
++ ENDIF()
++ IF(EMBREE_ISA_AVX2)
++ INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree_avx2-targets.cmake")
++ ENDIF()
+ ENDIF()
+
+ INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree-targets.cmake")
diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake index 6832847dd..94530619e 100755 --- a/ports/embree3/portfile.cmake +++ b/ports/embree3/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-path.patch + fix-static-usage.patch ) string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} static EMBREE_STATIC_LIB) @@ -37,4 +38,4 @@ endif() file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/${PORT}/doc) file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
\ No newline at end of file |