3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-01 13:37:55 +08:00
Code Issues Projects Releases Wiki Activity

[embree3]Change EMBREE_ROOT_DIR path setting, EMBREE_LIBRARY Debug/Release path setting, Update version.

Browse Source
This commit is contained in:
AlvinZhangH 2019-10-14 16:01:41 +08:00
parent 80aa0ab06e
commit 14fa259ebf
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/embree3/CONTROL
View File

@ -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

26
ports/embree3/fix-embree-path.patch Normal file
View File

@ -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)

1
ports/embree3/portfile.cmake
View File

@ -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)