diff options
| author | Lily <47812810+wangli28@users.noreply.github.com> | 2019-08-21 05:55:51 +0800 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-08-20 14:55:51 -0700 |
| commit | d941bb553a6d1a63569b4bb7681ab57f869f64e2 (patch) | |
| tree | 0273f94bff40e28ad7b95f909d450727263d86e0 | |
| parent | bad7798afedadadc34c3f18244f88c53d294b0dc (diff) | |
| download | vcpkg-d941bb553a6d1a63569b4bb7681ab57f869f64e2.tar.gz vcpkg-d941bb553a6d1a63569b4bb7681ab57f869f64e2.zip | |
[embree3] Fix install path (#7767)
| -rw-r--r-- | ports/embree3/CONTROL | 3 | ||||
| -rw-r--r-- | ports/embree3/fix-InstallPath.patch | 15 | ||||
| -rw-r--r-- | ports/embree3/portfile.cmake | 13 |
3 files changed, 22 insertions, 9 deletions
diff --git a/ports/embree3/CONTROL b/ports/embree3/CONTROL index 77d06de9b..431f60704 100644 --- a/ports/embree3/CONTROL +++ b/ports/embree3/CONTROL @@ -1,4 +1,5 @@ Source: embree3 -Version: 3.5.2 +Version: 3.5.2-1 +Homepage: https://github.com/embree/embree Description: High Performance Ray Tracing Kernels. Build-Depends: tbb diff --git a/ports/embree3/fix-InstallPath.patch b/ports/embree3/fix-InstallPath.patch new file mode 100644 index 000000000..316fa594d --- /dev/null +++ b/ports/embree3/fix-InstallPath.patch @@ -0,0 +1,15 @@ +diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake +index 3c3980d..0c365ac 100644 +--- a/common/cmake/package.cmake ++++ b/common/cmake/package.cmake +@@ -124,8 +124,8 @@ CONFIGURE_FILE(common/cmake/embree-config-version.cmake embree-config-version.cm + # create a config file for the build directory + CONFIGURE_FILE(common/cmake/embree-config-builddir.cmake embree-config.cmake @ONLY) + +-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR} RENAME "embree-config.cmake" COMPONENT devel) +-INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR} COMPONENT devel) ++INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-install.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR}/share/embree3 RENAME "embree-config.cmake" COMPONENT devel) ++INSTALL(FILES "${PROJECT_BINARY_DIR}/embree-config-version.cmake" DESTINATION ${EMBREE_CMAKECONFIG_DIR}/share/embree3 COMPONENT devel) + + ############################################################## + # CPack specific stuff diff --git a/ports/embree3/portfile.cmake b/ports/embree3/portfile.cmake index 142be6cd6..4abc91470 100644 --- a/ports/embree3/portfile.cmake +++ b/ports/embree3/portfile.cmake @@ -6,6 +6,8 @@ vcpkg_from_github( REF v3.5.2 SHA512 f00403c8bc76428088a38990117245b5b11ac90a2df21fa12c2d5c2e8af45fb3708abb705c612e0d9d7b0cfe4edb51c8b9630b60081b39fcb4370f31ee37acc7 HEAD_REF master + PATCHES + fix-InstallPath.patch ) file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake) @@ -33,18 +35,13 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() -# these cmake files do not seem to contain helpful configuration for find libs, just remove them -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config-version.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake) +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin") + vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +endif() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/models) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/models) -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree3) file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree3/doc) # Handle copyright |