diff options
| author | AlvinZhangH <260137639@qq.com> | 2019-10-14 16:01:41 +0800 |
|---|---|---|
| committer | AlvinZhangH <260137639@qq.com> | 2019-10-14 16:01:41 +0800 |
| commit | 14fa259ebfb997a1d4f1458a2b29f1d07f27d3e2 (patch) | |
| tree | 0fa94238cb2c47002384bfa6561388b0356805f5 | |
| parent | 80aa0ab06e6fd488ce230f086d98b32144616cf5 (diff) | |
| download | vcpkg-14fa259ebfb997a1d4f1458a2b29f1d07f27d3e2.tar.gz vcpkg-14fa259ebfb997a1d4f1458a2b29f1d07f27d3e2.zip | |
[embree3]Change EMBREE_ROOT_DIR path setting, EMBREE_LIBRARY Debug/Release path setting, Update version.
| -rw-r--r-- | ports/embree3/CONTROL | 2 | ||||
| -rw-r--r-- | ports/embree3/fix-embree-path.patch | 26 | ||||
| -rw-r--r-- | ports/embree3/portfile.cmake | 1 |
3 files changed, 28 insertions, 1 deletions
diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL index be2b8ba86..d27eefbcc 100644 --- a/ports/embree3/CONTROL +++ b/ports/embree3/CONTROL @@ -1,5 +1,5 @@ Source: embree3 -Version: 3.5.2-2 +Version: 3.5.2-3 Homepage: https://github.com/embree/embree Description: High Performance Ray Tracing Kernels. Build-Depends: tbb diff --git a/ports/embree3/fix-embree-path.patch b/ports/embree3/fix-embree-path.patch new file mode 100644 index 000000000..316112755 --- /dev/null +++ b/ports/embree3/fix-embree-path.patch @@ -0,0 +1,26 @@ +diff --git a/common/cmake/embree-config.cmake b/common/cmake/embree-config.cmake +index cab4d41..da84d3d 100644 +--- a/common/cmake/embree-config.cmake ++++ b/common/cmake/embree-config.cmake +@@ -14,11 +14,19 @@ + ## limitations under the License. ## + ## ======================================================================== ## + +-SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/@EMBREE_RELATIV_ROOT_DIR@) ++SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../../@EMBREE_RELATIV_ROOT_DIR@) + GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" ABSOLUTE) + + SET(EMBREE_INCLUDE_DIRS ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_INCLUDEDIR@) +-SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@) ++ ++IF (CMAKE_BUILD_TYPE STREQUAL Debug) ++ SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/debug/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@) ++ENDIF () ++ ++IF (CMAKE_BUILD_TYPE STREQUAL Release) ++ SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@) ++ENDIF () ++ + SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY}) + + MARK_AS_ADVANCED(embree_DIR) diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake index c43dbb45c..0d314da1c 100644 --- a/ports/embree3/portfile.cmake +++ b/ports/embree3/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES fix-InstallPath.patch fix-cmake-path.patch + fix-embree-path.patch ) file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake) |